[Merge]

bzr revid: vir@tinyerp.com-20100819042753-mde1b6pzia2rjfoz

311 files changed, 7458 insertions, 5554 deletions

diff --git a/addons/account/account.py b/addons/account/account.py
index ff5e8d4db82..d0e4e66cd60 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -197,19 +197,6 @@ class account_account(osv.osv):
     _parent_store = True
     logger = netsvc.Logger()
 
-    def _get_children_and_consol(self, cr, uid, ids, context={}):
-        ids2=[]
-        temp=[]
-        read_data= self.read(cr, uid, ids,['id','child_id'], context)
-        for data in read_data:
-            ids2.append(data['id'])
-            if data['child_id']:
-                temp=[]
-                for x in data['child_id']:
-                    temp.append(x)
-                ids2 += self._get_children_and_consol(cr, uid, temp, context)
-        return ids2
-
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
         if context is None:
@@ -244,7 +231,9 @@ class account_account(osv.osv):
         return super(account_account, self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
 
-    def _get_children_and_consol(self, cr, uid, ids, context={}):
+    def _get_children_and_consol(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         #this function search for all the children and all consolidated children (recursively) of the given account ids
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)
         ids3 = []
@@ -418,16 +407,16 @@ class account_account(osv.osv):
         'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
     }
 
-    def _default_company(self, cr, uid, context={}):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if user.company_id:
-            return user.company_id.id
-        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+#    def _default_company(self, cr, uid, context={}):
+#        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+#        if user.company_id:
+#            return user.company_id.id
+#        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
 
     _defaults = {
         'type': lambda *a : 'view',
         'reconcile': lambda *a: False,
-        'company_id': _default_company,
+        #'company_id': _default_company,
         'active': lambda *a: True,
         'check_history': lambda *a: True,
         'currency_mode': lambda *a: 'current',
@@ -795,10 +784,8 @@ class account_fiscalyear(osv.osv):
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
-        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
-                                  help='When fiscal year is created. The state is \'Draft\'. At the end of the year it is in \'Done\' state.'),
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True),
     }
-
     _defaults = {
         'state': lambda *a: 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
@@ -875,11 +862,10 @@ class account_period(osv.osv):
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
         'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
-        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
+        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
     _defaults = {
         'state': lambda *a: 'draft',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     _order = "date_start"
 
@@ -1010,7 +996,6 @@ class account_journal_period(osv.osv):
     _defaults = {
         'state': lambda *a: 'draft',
         'active': lambda *a: True,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     _order = "period_id"
 
@@ -1055,13 +1040,13 @@ class account_move(osv.osv):
         ids = []
         if name:
             ids += self.search(cr, user, [('name','ilike',name)]+args, limit=limit, context=context)
-        
+
         if not ids and name and type(name) == int:
             ids += self.search(cr, user, [('id','=',name)]+args, limit=limit, context=context)
 
         if not ids:
             ids += self.search(cr, user, args, limit=limit, context=context)
-        
+
         return self.name_get(cr, user, ids, context=context)
 
     def name_get(self, cursor, user, ids, context=None):
@@ -1171,7 +1156,7 @@ class account_move(osv.osv):
                 if move.name =='/':
                     new_name = False
                     journal = move.journal_id
-                    
+
                     if invoice and invoice.internal_number:
                         new_name = invoice.internal_number
                     else:
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 298b60d3964..6effce8f488 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -153,7 +153,7 @@
                         <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
-                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                        <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                         <newline/>
                         <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
@@ -262,7 +262,7 @@
                     <field name="journal_id" groups="base.group_user"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
-                    <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
+                    <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     <newline/>
                     <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index dcf97c91c95..74c8234860d 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -7,14 +7,14 @@
         <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system,group_account_invoice"/>
         <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5" groups="base.group_system"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system,group_account_invoice,group_account_manager,group_account_user"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system,group_account_manager,group_account_user"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" 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"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3e126d9d4d5..bb0e96a8380 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -660,7 +660,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended,base.group_system" id="menu_action_account_type_form" parent="menu_low_level"/>
+        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
         <!--
     Entries
     -->
@@ -676,6 +676,7 @@
                     <field name="period_id"/>
                     <field name="journal_id"/>
                     <field name="partner_id"/>
+                    <field name="reconcile_id"/>
                     <field name="amount" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>
@@ -2142,7 +2143,7 @@
             <field name="view_mode">tree,form,search</field>
         </record>
 
-        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts"/>
+        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts" sequence="1"/>
 
         <!-- Account Tax Templates -->
 
@@ -2326,8 +2327,7 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                  <field name="company_id"  widget="selection"
-                         />
+                  <field name="company_id" widget="selection"/>
                   <field name ="code_digits" />
                   <field name="chart_template_id"/>
                   <field name ="seq_journal" />
@@ -2428,7 +2428,7 @@
         <menuitem
             action="action_account_fiscal_position_template_form"
             id="menu_action_account_fiscal_position_form_template"
-            parent="account_template_folder" sequence="20"/>
+            parent="account_template_taxes" sequence="20"/>
 
         <!-- Cash Statement -->
         <record id="view_cash_statement_tree" model="ir.ui.view">
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index eba0e31f106..bfef98145a6 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -191,7 +191,7 @@
 			            <field name="code">1104</field>
 			            <field name="name">Bank Current Account</field>
 			            <field ref="conf_cas" name="parent_id"/>
-			            <field name="type">view</field>
+			            <field name="type">other</field>
 			            <field name="user_type" ref="conf_account_type_bnk"/>
 			        </record>
 			
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 159f5991539..16400cb3d7e 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:26+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Danish <da@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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 8f0e2fa1ed3..9d35f8940b8 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 794c2b3e7c2..9e0ddc90c16 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-06-09 05:58+0000\n"
+"PO-Revision-Date: 2010-08-18 18:15+0000\n"
 "Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -41,7 +41,7 @@ msgstr "Codificación asientos"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Especificar mensaje para Reporte de Pagos Vencidos"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -56,12 +56,12 @@ msgstr "Activo"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nombre de modelo inválido en definición de acción"
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Moneda usada para los asientos"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -81,6 +81,7 @@ msgstr ""
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
+"Dejar vacío para utilizar el período de la fecha de validación (factura)."
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
@@ -118,7 +119,7 @@ msgstr "Padre"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Diario de comprobantes"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -303,7 +304,7 @@ msgstr "Fijo"
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "Pagos fuera de plazo"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -325,7 +326,7 @@ msgstr "Origen"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Nombre de Movimiento"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -388,7 +389,7 @@ msgstr "Descripción en facturas"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -435,12 +436,12 @@ msgstr "Negativo"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Nombre de Cuenta/Empresa"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr ""
+msgstr "Contra"
 
 #. module: account
 #: field:account.analytic.account,state:0
@@ -481,7 +482,7 @@ msgstr "Conciliación bancaria"
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Desc.(%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -531,7 +532,7 @@ msgstr "Factura de proveedor"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr ""
+msgstr "Pago conciliado"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
@@ -547,12 +548,12 @@ msgstr "Plantillas impuestos"
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Pagado/Conciliado"
 
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr ""
+msgstr "Método cierre"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -563,7 +564,7 @@ msgstr "Incluir en importe base"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Código base reembolso"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -573,7 +574,7 @@ msgstr "Línea"
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "J.C. or Move name"
-msgstr ""
+msgstr "Cód. diario o asiento"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -593,7 +594,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr ""
+msgstr "Impuesto"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -609,7 +610,7 @@ msgstr "Mov."
 #: 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 "Balance de empresa anterior"
 
 #. module: account
 #: view:account.journal:0
@@ -622,6 +623,8 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
+"El campo secuencia es usado para ordenar los recursos secuencialmente de "
+"menor a mayor"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -632,7 +635,7 @@ msgstr "(dejarlo vacío para abrir la situación actual)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Fiscal Position Accounts Mapping"
-msgstr ""
+msgstr "Mapeo de cuentas por tipo de Contribuyentes"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -643,17 +646,17 @@ msgstr "Contacto"
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Terminos de Pago"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Conciliación asiento contable"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr ""
+msgstr "Abrir para la conciliación bancaria"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -664,7 +667,7 @@ msgstr "Descuento (%)"
 #: 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 "Importe desajuste"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
@@ -692,7 +695,7 @@ msgstr "Asientos analíticos"
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "mes"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
@@ -707,7 +710,7 @@ msgstr "Información adicional"
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Nota de Debito"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -720,22 +723,22 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Signo código impuesto"
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Importe total que este cliente debe."
 
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr ""
+msgstr "Ext."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_line_open
 msgid "account.move.line"
-msgstr ""
+msgstr "Linea de Asiento Contable"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
@@ -751,12 +754,12 @@ msgstr "Nombre del campo"
 #: field:account.tax.code,sign:0
 #: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr ""
+msgstr "Signo para el padre"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Diario asientos cierre del ejercicio"
 
 #. module: account
 #: view:product.product:0
@@ -767,7 +770,7 @@ msgstr "Propiedades de compra"
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 msgid "Can be draft or validated"
-msgstr ""
+msgstr "Puede ser borrador o válido"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
@@ -798,7 +801,7 @@ msgstr "Periodo hasta"
 #. module: account
 #: field:account.account.type,partner_account:0
 msgid "Partner account"
-msgstr ""
+msgstr "Cuenta de la empresa"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
@@ -811,7 +814,7 @@ msgstr "Generar asientos antes:"
 #: 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 "Diario de Costos"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -824,7 +827,7 @@ msgstr "(dejarlo vacío para todos los ejercicios fiscales abiertos)"
 #. module: account
 #: field:account.invoice,move_lines:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Linea de Asiento Contable"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
@@ -838,6 +841,8 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Estos tipos se definen de acuerdo a su país. El tipo contiene más "
+"información acerca de la cuenta y sus especificidades."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -847,7 +852,7 @@ msgstr "6"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Conciliación Bancaria"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -871,7 +876,7 @@ msgstr "Imprimir diario"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "Cuentas de Banco"
 
 #. module: account
 #: field:account.move.line,date_created:0
@@ -898,13 +903,13 @@ msgstr "Cuenta de gastos"
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Diario de desajuste"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Importe de Moneda"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -914,7 +919,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Nuevo ejercicio fiscal"
 
 #. module: account
 #: help:account.tax,tax_group:0
@@ -928,12 +933,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Ejercicio fiscal a abrir"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr ""
+msgstr "Seleccionar plan contable"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -959,7 +964,7 @@ msgstr "Fecha final"
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Importe código base"
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -975,7 +980,7 @@ msgstr "Cuenta debe por defecto"
 #: 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 "Asientos por extractos bancarios"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1034,7 +1039,7 @@ msgstr "Posición fiscal"
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
@@ -1050,7 +1055,7 @@ msgstr "Hijos"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Fiscal Position Taxes Mapping"
-msgstr ""
+msgstr "Mapeo de Impuestos segun tipo de Contribuyente"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 9ff3b1ecf5b..00a811a1ed0 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:17+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index f8506c5162e..b470e328790 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 13:11+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 20:38+0000\n"
+"Last-Translator: Andrea <amarin@mr-service.it>\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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -6271,33 +6271,33 @@ msgstr ""
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Intervallo"
 
 #. module: account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "Modulo che aggiunge nuovi report basati sul modulo Conti (Account)"
 
 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Resoconto - Rapporto"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo per Tipo Conto"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Settimana dell'anno"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data di Creazione"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
@@ -6308,7 +6308,7 @@ msgstr ""
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Importo non tassato"
 
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.wizard"
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 95d80389a39..b40a829b01e 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:38+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index c33593dc4f2..b660713e522 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index 242fd947278..adbb61ec3fe 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:19+0000\n"
+"PO-Revision-Date: 2010-08-18 13:08+0000\n"
 "Last-Translator: bokshas <astritbokshi@gmail.com>\n"
 "Language-Team: Albanian <sq@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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 4241c2a2fb7..5794606aec4 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:45+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:18+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 48208741f39..454819e832a 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:37+0000\n"
+"PO-Revision-Date: 2010-08-18 13:19+0000\n"
 "Last-Translator: Omer Barlas <omer@barlas.com.tr>\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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index dfccbb8e388..74a8e214bf3 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:18+0000\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
 "Last-Translator: Jeff Wang <wjfonhand@hotmail.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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a463a7d48c9..cff1ce60141 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -539,22 +539,21 @@ class account_invoice(osv.osv):
             if journal_ids:
                 val['journal_id'] = journal_ids[0]
             else:
-                raise osv.except_osv(_('Configuration Error !'),
-                                _('Can not find account journal for this company in invoice, Please Create journal.'))
+                raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.' % (journal_type)))
             dom = {'journal_id':  [('id', 'in', journal_ids)]}
         else:
             journal_ids = obj_journal.search(cr, uid, [])
 
         if currency_id and company_id:
             currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
-            if currency.company_id.id != company_id:
+            if currency.company_id and currency.company_id.id != company_id:
                 val['currency_id'] = False
             else:
                 val['currency_id'] = currency.id
 
         if company_id:
             company = self.pool.get('res.company').browse(cr, uid, company_id)
-            if company.currency_id.company_id.id != company_id:
+            if company.currency_id.company_id and company.currency_id.company_id.id != company_id:
                 val['currency_id'] = False
             else:
                 val['currency_id'] = company.currency_id.id
@@ -1386,10 +1385,6 @@ class account_invoice_line(osv.osv):
         company = self.pool.get('res.company').browse(cr, uid, company_id)
         currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
 
-        if not currency.company_id.id == company.id:
-            raise osv.except_osv(_('Configuration Error !'),
-                        _('Can not select currency that is not related to any company.\nPlease select accordingly !.'))
-
         if company.currency_id.id != currency.id:
             new_price = res_final['value']['price_unit'] * currency.rate
             res_final['value']['price_unit'] = new_price
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 1fec339eb84..e9360cad741 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -18,28 +18,20 @@
     </record>
 
 
-<!--    <record id="menu_finance_configuration" model="ir.ui.menu">-->
-<!--        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>-->
-<!--    </record>-->
-
     <record id="menu_finance_reporting" model="ir.ui.menu">
         <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
     </record>
 
     <record id="menu_finance_legal_statement" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager'),ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_finance_receivables" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_invoice'),ref('group_account_manager'),ref('group_account_user')])]" name="groups_id"/>
     </record>
 
     <record id="menu_finance_payables" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_invoice'), ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_automatic_reconcile" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_invoice'), ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
     </record>
 
     <record id="menu_finance_charts" model="ir.ui.menu">
@@ -47,35 +39,35 @@
     </record>
 
     <record id="menu_eaction_account_moves_sale" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
     </record>
 
     <record id="menu_eaction_account_moves_purchase" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
     </record>
 
     <record id="menu_action_invoice_tree1" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_action_invoice_tree2" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_action_invoice_tree3" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_action_invoice_tree4" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_finance_bank_and_cash" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_action_account_tree2" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_finance_entries" model="ir.ui.menu">
@@ -83,7 +75,7 @@
     </record>
 
     <record id="menu_action_move_journal_line_form" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_eaction_account_moves_all" model="ir.ui.menu">
@@ -95,19 +87,15 @@
     </record>
 
     <record id="final_accounting_reports" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_journals_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_action_tax_code_tree" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_analytic_account_tree2" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_finance_periodical_processing" model="ir.ui.menu">
@@ -115,47 +103,39 @@
     </record>
 
     <record id="menu_general_ledger" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_general_Balance_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_account_bs_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_account_pl_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_tax_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="next_id_22" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="next_id_40" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
     </record>
 
     <record id="menu_action_account_invoice_report_all" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
     </record>
 
     <record id="menu_action_account_entries_report_all" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
     </record>
 
     <record id="menu_finance_statistic_report_statement" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_account_invoice_report_all" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
     </record>
 
     <record id="account_move_comp_rule" model="ir.rule">
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 8dbcf4ecf5b..3b9e6c31e72 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -11,7 +11,7 @@
 "access_account_journal_column","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
 "access_account_journal","account.journal","model_account_journal","account.group_account_user",1,0,0,0
 "access_account_period","account.period","model_account_period","account.group_account_user",1,0,0,0
-"access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,1,1,1
+"access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,0,0,0
 "access_account_journal_period","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
 "access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
 "access_account_move_line","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
@@ -22,16 +22,18 @@
 "access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
 "access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
 "access_account_subscription_line","account.subscription.line","model_account_subscription_line","account.group_account_user",1,1,1,1
-"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
-"access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,1,1,1
+"access_account_subscription_manager","account.subscription manager","model_account_subscription","account.group_account_manager",1,0,0,0
+"access_account_subscription_line_manager","account.subscription.line manager","model_account_subscription_line","account.group_account_manager",1,0,0,0
+"access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,0,0,0
 "access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,0,0,0
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
-"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
+"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,0,0,0
 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
 "access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_account_user",1,1,1,1
 "access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_account_user",1,1,1,1
 "access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
+"access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
 "access_report_hr_timesheet_invoice_journal","report.hr.timesheet.invoice.journal","model_report_hr_timesheet_invoice_journal","account.group_account_manager",1,0,0,0
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
 "access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_account_user",1,0,0,0
@@ -42,23 +44,22 @@
 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
-"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
-"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,1,1,1
-"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
-"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
-"access_account_account_manager","account.account","model_account_account","account.group_account_manager",1,1,1,1
-"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
-"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
-"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
+"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,0,0,0
+"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,0,0,0
+"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,0,0,0
+"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,0,0,0
+"access_account_account_manager","account.account","model_account_account","account.group_account_manager",1,0,0,0
+"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,0,0,0
+"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,0,0,0
+"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,0,0,0
 "access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
 "access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,0,0,0
 "access_account_period_invoice","account.period invoice","model_account_period","account.group_account_invoice",1,0,0,0
 "access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,0,0,0
-"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
 "access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","account.group_account_manager",1,1,1,1
-"access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,1,1,1
-"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
+"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","account.group_account_manager",1,0,0,0
+"access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,0,0,0
+"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,0,0,0
 "access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
 "access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
 "access_account_fiscalyear_partner_manager","account.fiscalyear.partnermanager","model_account_fiscalyear","base.group_partner_manager",1,0,0,0
@@ -70,48 +71,43 @@
 "access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
 "access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
 "access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
-"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,0,0,0
 "access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
 "access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
-"access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,0,0,0
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
 "access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,1,1,1
 "access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
-"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,0,0,0
-"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_account_manager",1,0,0,0
-"access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
-"access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
+"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,1,1,1
+"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_account_manager",1,1,1,1
+"access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,1,1,1
+"access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,1,1,1
 "access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,1,1,1
-"access_res_partner_group_account_manager","res_partner group_account_manager","model_res_partner","account.group_account_manager",1,1,1,1
+"access_res_partner_group_account_manager","res_partner group_account_manager","model_res_partner","account.group_account_manager",1,0,0,0
 "access_account_invoice_accountant","account.invoice accountant","model_account_invoice","account.group_account_user",1,0,0,0
 "access_account_tax_code_accountant","account.tax.code accountant","model_account_tax_code","account.group_account_user",1,1,1,1
-"access_account_analytic_chart","account.analytic.chart","model_account_analytic_chart","account.group_account_user",1,1,1,1
-"access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,1,1,1
+"access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,0,0,0
 "access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0
 "access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
 "access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,0,0,0
-"access_account_analytic_chart_manager","account.analytic.chart manager","model_account_analytic_chart","account.group_account_manager",1,0,0,0
 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,0,0,0
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0
 "access_account_move_line_system","account.move.line system","model_account_move_line","base.group_system",1,0,0,0
 "access_account_invoice_system","account.invoice system","model_account_invoice","base.group_system",1,0,0,0
 "access_account_bank_statement_system","account.bank.statement system","model_account_bank_statement","base.group_system",1,0,0,0
 "access_account_move_system","account.move system","model_account_move","base.group_system",1,0,0,0
 "access_account_analytic_line_system","account.analytic.line system","model_account_analytic_line","base.group_system",1,0,0,0
-"access_account_analytic_system","account.analytic.chart system","model_account_analytic_chart","base.group_system",1,0,0,0
 "access_account_tax_code_system","account.tax.code system","model_account_tax_code","base.group_system",1,1,1,1
 "access_account_journal_system","account.journal system","model_account_journal","base.group_system",1,1,1,1
-"access_account_chart_system","account.chart system","model_account_chart","base.group_system",1,0,0,0
 "access_account_period_system","account.period system","model_account_period","base.group_system",1,1,1,1
-"access_account_chart_accountant","account.chart accountant","model_account_chart","group_account_user",1,0,0,0
 "access_account_journal_view_system","account.journal.view system","model_account_journal_view","base.group_system",1,1,1,1
 "access_account_account_type_system","account.account.type system","model_account_account_type","base.group_system",1,1,1,1
 "access_account_analytic_journal_system","account.analytic.journal system","model_account_analytic_journal","base.group_system",1,1,1,1
@@ -156,7 +152,6 @@
 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
 "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
-"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_invoice",1,0,0,0
 "access_account_invoice_accounting_accountant","account.invoice","model_account_invoice","account.group_accounting_accountant",1,1,1,1
 "access_account_invoice_line_accounting_accountant","account.invoice.line","model_account_invoice_line","account.group_accounting_accountant",1,1,1,1
 "access_res_partner_accounting_accountant","res.partner","base.model_res_partner","account.group_accounting_accountant",1,1,1,1
@@ -204,9 +199,4 @@
 "access_account_analytic_line_accounting_accountant","account.analytic.line","analytic.model_account_analytic_line","account.group_accounting_accountant",1,0,0,0
 "access_account_analytic_journal_accounting_accountant","account.analytic.journal","model_account_analytic_journal","account.group_accounting_accountant",1,0,0,0
 "access_account_bank_statement_reconcile_accounting_accountant","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_accounting_accountant",1,1,1,1
-"access_account_move_account_user","account.move","model_account_move","account.group_account_user",1,1,1,1
-"access_account_move_line_account_user","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
-"access_account_journal_account_user","account.journal","model_account_journal","account.group_account_user",1,0,0,0
-"access_account_journal_view_account_user","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
-"access_account_journal_period_account_user","account.journal.period","model_account_journal_period","account.group_account_user",1,0,0,0
-"access_account_journal_column_account_user","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
+"access_account_move_journal_manager","account.move.journal.manager","model_account_move_journal","account.group_account_manager",1,0,0,0
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 79f41ec2d46..1d0dce85910 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -47,6 +47,8 @@ class account_move_journal(osv.osv_memory):
         journal_pool = self.pool.get('account.journal')
         if context.get('journal_type', False):
             jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
+            if not jids:
+                raise osv.except_osv(_('Configuration Error !'), _('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.' % (context.get('journal_type'))))
             journal_id = jids[0]
 
         return journal_id
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index a2b9fd7ca9c..12836665adf 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:39+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index d6cf27f99f1..e9b77e5a3c3 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Finnish <fi@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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index 4a62e8b3c9c..24abf9cb3d9 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account_analytic_analysis
+# 	* account_analytic_analysis
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 15:51+0000\n"
+"PO-Revision-Date: 2010-08-18 12:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \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-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -22,6 +22,8 @@ msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
 msgstr ""
+"Numero di ore che possono essere fatturate più quelle che sono già state "
+"fatturate."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -31,17 +33,18 @@ msgstr "Riepilogo ore per utente"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "Ultima data di fatturazione"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
+"Calcolato usando la formula: Prezzo massimo fattura - Importo fattura."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr ""
+msgstr "Calcolato usando la formula: Quantità massima - Ore Totali."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
@@ -52,7 +55,7 @@ msgstr "Elenco contabilità analitiche"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
 msgid "My Current Accounts"
-msgstr ""
+msgstr "I miei attuali Conti"
 
 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
@@ -62,17 +65,17 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr ""
+msgstr "Data dell'ultima fattura creata per questo conto analitico"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theorical Revenue"
-msgstr ""
+msgstr "Reddito teorico"
 
 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modello non valido nella definizione dell'azione."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -101,13 +104,13 @@ msgstr "Margine teorico"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
+msgstr "Tasso di margine reale (%)"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
 msgid "Current Analytic Accounts"
-msgstr ""
+msgstr "Conto analitico attuale"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@@ -144,6 +147,8 @@ msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
 msgstr ""
+"Numero di ore dedicate al conto analitico (dal Foglio ore). E stato "
+"calcolato da tutti i Giornali di tipo 'Generale'."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
@@ -157,6 +162,9 @@ msgid ""
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
 msgstr ""
+"Basato sul costo che hai sul Progetto, che cosa sarebbe stato il reddito se "
+"tutti questi costi fossero stati fatturati al normale prezzo di vendita "
+"fornito dal listino."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -168,7 +176,7 @@ msgstr "Utente"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
 msgid "My Pending Accounts"
-msgstr ""
+msgstr "Conti personali pendenti"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
@@ -185,7 +193,7 @@ msgstr "Calcolato utilizzando la formula: importo fatturato - totale costi"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
 msgid "My Accounts"
-msgstr ""
+msgstr "Conti personali"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -194,6 +202,10 @@ msgid ""
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
+"Modifica la vista dei conti analitici per mostrare\n"
+"dati importanti per il Responsabile dei Progetti di una Compagnia di "
+"servizi.\n"
+"Aggiunge un menù per mostrare informazioni di nota per ogni Responsabile."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
@@ -213,7 +225,7 @@ msgstr "Contabilità Analitica"
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
-msgstr ""
+msgstr "report_account_analytic"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -254,7 +266,7 @@ msgstr "Margine reale"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr ""
+msgstr "Importo totale fatture cliente  per questo conto"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
@@ -284,7 +296,7 @@ msgstr "Contabilità Analitica"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "Reddito rimanente"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -292,6 +304,8 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
+"Se fattura generata dal conto analitico, il rimanente importo lo puoi "
+"fatturare al cliente basandosi sui costi totali."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -301,7 +315,7 @@ msgstr "Calcolato utilizzando la formula: Totale fatturato / tot. ore"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr ""
+msgstr "Reddito orario (reale)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -325,13 +339,13 @@ msgstr "Contabilità Analitica"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr ""
+msgstr "Conti oltrepassati"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "All Uninvoiced Entries"
-msgstr ""
+msgstr "Tutte le voci fatturate"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -339,3 +353,5 @@ msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
 msgstr ""
+"Totale dei costi per questo conto. Include i costi reali (dalle fatture) e i "
+"costi indiretti, come il tempo speso sul Foglio Orario."
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 21c5a530394..5c9e923caa5 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:28+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 392c905cbbc..f8af5b33671 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:40+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po
index 82adc2be1dc..b99f4a148f6 100644
--- a/addons/account_analytic_default/i18n/it.po
+++ b/addons/account_analytic_default/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:15+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 10:02+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index f4767166868..2a1ea6f65c3 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:40+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index bb271e66084..45b75eb3d4d 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:40+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 6367259395d..f1b821a4493 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:32+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 11:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index a747c6677b9..715d83d8430 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:40+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index f3b25c67958..9ac00914a91 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:38+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 01a64730c8d..456b0084aea 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:43+0000\n"
+"PO-Revision-Date: 2010-08-18 13:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index ce4e24fe27c..8f5c64a6486 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:28+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po
index 87b30782043..39bdf74e9a8 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-08-16 09:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: bamuhrez <bamuhrez@gmail.com>\n"
 "Language-Team: Arabic <ar@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-08-17 07:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index 93f8d5ca2bc..7e04757d27d 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:38+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index 71bf3144cd0..c9c84016309 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:40+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index ca1604e2375..c338ad44f27 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -47,7 +47,7 @@
             <field name="res_model">account_followup.stat</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem string="Partners Follow-Ups" id="menu_action_followup_stat" parent="account.menu_finance_generic_reporting"/>
+        <menuitem name="Partners Follow-Ups" id="menu_action_followup_stat" parent="account.menu_finance_generic_reporting"/>
 
         <menuitem action="action_followup_stat" id="menu_action_followup_stat_follow" parent="menu_action_followup_stat"/>
 
diff --git a/addons/account_invoice_layout/i18n/it.po b/addons/account_invoice_layout/i18n/it.po
index 52c1a38f445..83e3db9b05e 100644
--- a/addons/account_invoice_layout/i18n/it.po
+++ b/addons/account_invoice_layout/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-08-18 16:43+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -37,7 +37,7 @@ msgstr ""
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Fattura cancellata"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -48,7 +48,7 @@ msgstr "Titolo"
 #. module: account_invoice_layout
 #: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
 msgid "Invoices with Layout and Message"
-msgstr ""
+msgstr "Fatture con Layout e Messaggi"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -58,7 +58,7 @@ msgstr "Sconto (%)"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "(Incl. taxes):"
-msgstr ""
+msgstr "(Tasse Incluse):"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -86,7 +86,7 @@ msgstr "Prezzo Unitario"
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_notify_message
@@ -121,7 +121,7 @@ msgstr "Rif. Cliente:"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -136,7 +136,7 @@ msgstr "Prezzo"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "/ ("
-msgstr ""
+msgstr "/ ("
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -151,7 +151,7 @@ msgstr "Account origine"
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
 msgid "Write Messages"
-msgstr ""
+msgstr "Scrivi Messaggi"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -191,7 +191,7 @@ msgstr "Interruzione di pagina"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Document:"
-msgstr ""
+msgstr "Documento:"
 
 #. module: account_invoice_layout
 #: wizard_view:wizard.notify_message,init:0
@@ -211,12 +211,12 @@ msgstr "Prodotto"
 #. module: account_invoice_layout
 #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
 msgid "Invoices with Layout"
-msgstr ""
+msgstr "Fattura con Layout"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description / Taxes"
-msgstr ""
+msgstr "Descrizione / Tasse"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -226,7 +226,7 @@ msgstr "Importo"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description/Taxes"
-msgstr ""
+msgstr "Descrizione / Tasse"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -266,7 +266,7 @@ msgstr "Fattura Fornitore"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Note :"
-msgstr ""
+msgstr "Annotazioni:"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -276,12 +276,12 @@ msgstr "Tassa"
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "account_invoice_layout"
-msgstr ""
+msgstr "account_invoice_layout"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Total (Excl. taxes):"
-msgstr ""
+msgstr "Totale (Tasse Escluse)"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po
index f257792c83e..671eacba502 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index b485706bc12..5e314bde9c4 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:42+0000\n"
+"PO-Revision-Date: 2010-08-18 13:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index ab38a25b823..25f73365d4d 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index 8644fc753ec..a137f83d18f 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:47+0000\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index 38e571f32b2..404a92e1835 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 14:41+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-08-18 16:40+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
@@ -21,17 +21,17 @@ msgstr ""
 #: selection:account.report.report,type:0
 #: model:ir.model,name:account_report.model_account_report_history
 msgid "Indicator"
-msgstr ""
+msgstr "Indicatore"
 
 #. module: account_report
 #: wizard_field:print.indicators.pdf,init,file:0
 msgid "Select a PDF File"
-msgstr ""
+msgstr "Seleziona un file PDF"
 
 #. module: account_report
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."
 
 #. module: account_report
 #: view:account.report.report:0
@@ -46,7 +46,7 @@ msgstr "Genitore"
 #. module: account_report
 #: field:account.report.report,disp_graph:0
 msgid "Display As Graph"
-msgstr ""
+msgstr "Visualizza come Grafico"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -66,7 +66,7 @@ msgstr ""
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Tabular Summary"
-msgstr ""
+msgstr "Tabella di Riepilogo"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -81,7 +81,7 @@ msgstr ""
 #. module: account_report
 #: view:account.report.report:0
 msgid "Very bad"
-msgstr ""
+msgstr "Pessima"
 
 #. module: account_report
 #: field:account.report.history,val:0
@@ -103,7 +103,7 @@ msgstr "Cattiva"
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Select the PDF file on which Indicators will be printed."
-msgstr ""
+msgstr "Seleziona il file PDF su cui gli indicatori saranno stampati"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -118,12 +118,12 @@ msgstr ""
 #. module: account_report
 #: selection:account.report.report,status:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Pessima"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
 msgid "Indicator history"
-msgstr ""
+msgstr "Storico dell'indicatore"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -143,18 +143,18 @@ msgstr ""
 #. module: account_report
 #: wizard_button:print.indicators,init,next:0
 msgid "Next"
-msgstr ""
+msgstr "Prossimo"
 
 #. module: account_report
 #: model:ir.module.module,shortdesc:account_report.module_meta_information
 msgid "Reporting for accounting"
-msgstr ""
+msgstr "Stampe per personale contabile"
 
 #. module: account_report
 #: wizard_button:print.indicators,next,print:0
 #: wizard_button:print.indicators.pdf,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "Stampa"
 
 #. module: account_report
 #: field:account.report.report,type:0
@@ -164,7 +164,7 @@ msgstr "Tipo"
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
 msgid "Print Indicators in PDF"
-msgstr ""
+msgstr "Stampa gli indicatori in PDF"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -180,7 +180,7 @@ msgstr "Buona"
 #. module: account_report
 #: view:account.report.history:0
 msgid "Account Report History"
-msgstr ""
+msgstr "Report Storico Conti"
 
 #. module: account_report
 #: constraint:ir.ui.view:0
@@ -190,12 +190,12 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 #. module: account_report
 #: help:account.report.report,badness_limit:0
 msgid "This Value sets the limit of badness."
-msgstr ""
+msgstr "Questo valore è impostato al limite del peggiore."
 
 #. module: account_report
 #: wizard_field:print.indicators,init,select_base:0
 msgid "Choose Criteria"
-msgstr ""
+msgstr "Seleziona il criterio"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -264,27 +264,27 @@ msgstr "Attivo"
 #. module: account_report
 #: field:account.report.report,disp_tree:0
 msgid "Display Tree"
-msgstr ""
+msgstr "Visualizza ad Albero"
 
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based On Fiscal Years"
-msgstr ""
+msgstr "Basato su anni fiscali"
 
 #. module: account_report
 #: model:ir.model,name:account_report.model_account_report_report
 msgid "Account reporting"
-msgstr ""
+msgstr "Stampe del piano dei conti"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Balance:"
-msgstr ""
+msgstr "Saldo Contabile:"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Expression :"
-msgstr ""
+msgstr "Espressione :"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -299,7 +299,7 @@ msgstr "Espressione"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Accounting reporting"
-msgstr ""
+msgstr "Report per personale Contabile"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_form
@@ -316,12 +316,12 @@ msgstr "Codice"
 #. module: account_report
 #: field:account.report.history,tmp:0
 msgid "temp"
-msgstr ""
+msgstr "temporaneo"
 
 #. module: account_report
 #: field:account.report.history,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Periodo"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -331,19 +331,19 @@ msgstr "Generale"
 #. module: account_report
 #: view:account.report.report:0
 msgid "Legend of operators"
-msgstr ""
+msgstr "Legenda degli operatori"
 
 #. module: account_report
 #: wizard_button:print.indicators,init,end:0
 #: wizard_button:print.indicators,next,end:0
 #: wizard_button:print.indicators.pdf,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #. module: account_report
 #: field:account.report.report,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Figlio"
 
 #. module: account_report
 #: constraint:ir.model:0
@@ -364,7 +364,7 @@ msgstr ""
 #: wizard_view:print.indicators,init:0
 #: wizard_view:print.indicators,next:0
 msgid "Print Indicators"
-msgstr ""
+msgstr "Stampa Indicatori"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -380,7 +380,7 @@ msgstr "Data di stampa:"
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
 msgid "Indicators in PDF"
-msgstr ""
+msgstr "Indicatori in PDF"
 
 #. module: account_report
 #: rml:accounting.report:0
@@ -391,7 +391,7 @@ msgstr "a"
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Accounting Report"
-msgstr ""
+msgstr "Stampe per personale contabile"
 
 #. module: account_report
 #: field:account.report.report,goodness_limit:0
@@ -402,7 +402,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
 msgid "Other reports"
-msgstr ""
+msgstr "Modulo: account_report"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -414,7 +414,7 @@ msgstr ""
 #. module: account_report
 #: rml:print.indicators:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
@@ -425,13 +425,13 @@ msgstr ""
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based on Fiscal Periods"
-msgstr ""
+msgstr "Basato su Periodi Fiscali"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_print_indicators
 #: rml:print.indicators:0
 msgid "Indicators"
-msgstr ""
+msgstr "Indicatori"
 
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
@@ -454,7 +454,7 @@ msgstr "Nome"
 #. module: account_report
 #: wizard_field:print.indicators,next,base_selection:0
 msgid "Select Criteria"
-msgstr ""
+msgstr "Seleziona il criterio"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -464,7 +464,7 @@ msgstr ""
 #. module: account_report
 #: field:account.report.history,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Anno Fiscale"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree
@@ -477,17 +477,17 @@ msgstr "Report personalizzato"
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Page"
-msgstr ""
+msgstr "Pagina"
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "View"
-msgstr ""
+msgstr "Visualizza"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Indicators -"
-msgstr ""
+msgstr "Indicatori -"
 
 #. module: account_report
 #: help:account.report.report,disp_graph:0
@@ -495,11 +495,13 @@ msgid ""
 "If the field is set to True, information will be printed as a Graph, "
 "otherwise as an array."
 msgstr ""
+"Se il campo è impostato a Vero, l'informazione verrà stampante come un "
+"Grafico, altrimenti come una lista."
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Return value for status"
-msgstr ""
+msgstr "Valore ritornato per lo Stato"
 
 #. module: account_report
 #: field:account.report.report,sequence:0
@@ -514,7 +516,7 @@ msgstr "Importo"
 #. module: account_report
 #: rml:print.indicators:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"
 
 #. module: account_report
 #: model:ir.module.module,description:account_report.module_meta_information
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index e2a57cd86e8..5cc0cbeddd2 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:42+0000\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index c9aef32cbdc..0444a6ed394 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:44+0000\n"
+"PO-Revision-Date: 2010-08-18 13:25+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_reporting/i18n/it.po b/addons/account_reporting/i18n/it.po
index c3cff3d090c..c70049f3d4d 100644
--- a/addons/account_reporting/i18n/it.po
+++ b/addons/account_reporting/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:24+0000\n"
-"Last-Translator: paola <pcaffaro@tiscali.it>\n"
+"PO-Revision-Date: 2010-08-18 09:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
@@ -53,12 +53,12 @@ msgstr "Tipo di Repporto"
 #: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
 #: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
 msgid "Balance Sheet Report"
-msgstr ""
+msgstr "Report Saldi contabili"
 
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -78,7 +78,7 @@ msgstr ""
 #. module: account_reporting
 #: help:account.account.balancesheet.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Tutti i periodi se lasciato vuoto"
 
 #. module: account_reporting
 #: field:account.report.bs,color_font:0
@@ -88,7 +88,7 @@ msgstr "Colore del Carattere"
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects With Accounts and child of Accounts"
-msgstr ""
+msgstr "Report Oggetti con Conti e Conti Figlio"
 
 #. module: account_reporting
 #: model:ir.module.module,description:account_reporting.module_meta_information
@@ -96,11 +96,13 @@ msgid ""
 "Financial and accounting reporting\n"
 "    Balance Sheet Report"
 msgstr ""
+"Stampe contabili e finanziarie\n"
+"    Report Saldi Contabili"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects With Accounts"
-msgstr ""
+msgstr "Report Oggetti con Conti"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -156,7 +158,7 @@ msgstr "Times-Italic"
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects Only"
-msgstr ""
+msgstr "Report Soli oggetti"
 
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_color_rml
@@ -202,12 +204,12 @@ msgstr "Anno fiscale"
 #: view:account.report.bs:0
 #: field:account.report.bs,account_id:0
 msgid "Accounts"
-msgstr ""
+msgstr "Conti"
 
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "Periodi"
 
 #. module: account_reporting
 #: field:account.report.bs,color_back:0
@@ -217,7 +219,7 @@ msgstr "Colore di Sfondo"
 #. module: account_reporting
 #: field:account.report.bs,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "Figlio"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,end:0
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index b49c78b0f98..e902df63647 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
+"PO-Revision-Date: 2010-08-18 13:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index 54f386f2ed0..84bf8fa96e0 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:45+0000\n"
+"PO-Revision-Date: 2010-08-18 13:19+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index c1eb6c6b269..1d8ac47efbd 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:42+0000\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 6fef206aa8d..cf7adabd84c 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -41,10 +41,11 @@
         "voucher_sequence.xml",
         "voucher_workflow.xml",
         "voucher_report.xml",
-        "voucher_view.xml",
-        "voucher_wizard.xml",
         "wizard/account_voucher_open_view.xml",
-
+        "voucher_view.xml",
+        "voucher_sales_purchase_view.xml",
+        "voucher_payment_receipt_view.xml",
+        "voucher_wizard.xml"
     ],
     "test" : [
          "test/account_voucher.yml",
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index fe3870eef5e..1fe031f7386 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:43+0000\n"
+"PO-Revision-Date: 2010-08-18 13:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 3bc355aca29..806da82f8db 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:42+0000\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/security/ir.model.access.csv b/addons/account_voucher/security/ir.model.access.csv
index bf7ee564bc1..b27392628f0 100644
--- a/addons/account_voucher/security/ir.model.access.csv
+++ b/addons/account_voucher/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_voucher_user","account.voucher","model_account_voucher","account.group_account_user",1,1,1,1
-"access_account_voucher_line_user","account.voucher.line","model_account_voucher_line","account.group_account_user",1,0,0,0
+"access_account_voucher_line_accountant","account.voucher.line.accountant","model_account_voucher_line","account.group_account_user",1,1,1,1
 "access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,0,0,0
-"access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,1,1,1
+"access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,0,0,0
 "access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1
 "access_account_voucher_system","account.voucher system","model_account_voucher","base.group_system",1,0,0,0
-"access_account_voucher_line_accountant","account.voucher.line accountant","model_account_voucher_line","account.group_account_user",1,1,1,1
+"access_account_voucher_line_system","account.voucher.line.system","model_account_voucher_line","base.group_system",1,0,0,0
 "access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 45afb6dcdd6..11829815bb8 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -25,24 +25,6 @@ from osv import fields
 from osv import osv
 from tools.translate import _
 
-journal2type = {
-    'bank':'receipt',
-    'cash':'receipt',
-    'sale':'sale',
-    'purchase':'purchase'
-}
-
-type2journal = {
-    'rec_voucher': 'cash',
-    'bank_rec_voucher': 'bank',
-    'pay_voucher': 'cash',
-    'bank_pay_voucher': 'bank',
-    'cont_voucher': 'cash',
-    'journal_sale_vou': 'sale',
-    'journal_pur_voucher': 'purchase',
-    'journal_voucher':'general'
-}
-
 class ir_sequence_type(osv.osv):
     _inherit = "ir.sequence.type"
     _columns = {
@@ -58,6 +40,71 @@ class account_journal(osv.osv):
     }
 account_journal()
 
+class account_move(osv.osv):
+    _inherit = 'account.move'
+    
+    def _get_line_ids(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
+            result[line.move_id.id] = True
+        return result.keys()
+    
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for move in self.browse(cr, uid, ids, context=context):
+            rs = {
+                'reconcile_id': False,
+            }
+            for line in move.line_id:
+                if line.reconcile_id:
+                    rs.update({
+                        'reconcile_id': line.reconcile_id.id
+                    })
+                    break
+            res[move.id] = rs
+        return res
+    
+    _columns = {
+        'reconcile_id': fields.function(_amount_all, method=True, type="many2one", relation="account.move.reconcile", select=True, string='Reconcile',
+            store=True,
+            multi='all'),
+    }
+    
+    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        """
+        Returns a list of ids based on search domain {args}
+    
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param args: list of conditions to be applied in search opertion
+        @param offset: default from first record, you can start from nth record
+        @param limit: number of records to be obtained as a result of search opertion
+        @param order: ordering on any field(s)
+        @param context: context arguments, like lang, time zone
+        @param count: 
+        
+        @return: Returns a list of ids based on search domain
+        """
+        if not context:
+            context = {}
+        ttype = context.get('type', False)
+        partner = context.get('partner_id', False)
+        voucher = context.get('voucher', False)
+        if voucher and not partner:
+            raise osv.except_osv(_('Invalid Partner !'), _('Please select the partner !'))
+            
+        if ttype and ttype in ('receipt'):
+            args += [('journal_id.type','in', ['sale', 'purchase_refund'])]
+        elif ttype and ttype in ('payment'):
+            args += [('journal_id.type','in', ['purchase', 'sale_refund'])]
+        elif ttype and ttype in('sale', 'purchase'):
+            raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal voucher with invoice !'))
+            args += [('journal_id.type','=', 'do_not_allow_search')]
+        res = super(account_move, self).search(cr, user, args, offset, limit, order, {}, count)
+        return res
+    
+account_move()
+
 class account_voucher(osv.osv):
 
     def _get_period(self, cr, uid, context={}):
@@ -71,9 +118,8 @@ class account_voucher(osv.osv):
             return False
 
     def _get_type(self, cr, uid, context={}):
-        vtype = context.get('type', 'bank')
-        voucher_type = journal2type.get(vtype)
-        return voucher_type
+        vtype = context.get('type', False)
+        return vtype
 
     def _get_reference_type(self, cursor, user, context=None):
         return [('none', 'Free Reference')]
@@ -122,7 +168,7 @@ class account_voucher(osv.osv):
             ('receipt', 'Receipt'),
             ('sale', 'Sales'),
             ('purchase', 'Purchase')],
-            'Default Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
+            'Type', select=True , size=128, readonly=True),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
@@ -151,10 +197,14 @@ class account_voucher(osv.osv):
         'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True, states={'draft':[('readonly',False)]}),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
         'audit': fields.related('move_id','to_check', type='boolean', relation='account.move', string='Audit Complete ?'),
-        'pay_now':fields.boolean('Pay Now ?', required=False),
+        'pay_now':fields.selection([
+            ('pay_now','Pay Now'),
+            ('pay_later','Pay Later'),
+        ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'pay_journal_id':fields.many2one('account.journal', 'Payment Journal', readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','in',['bank','cash'])]),
         'pay_account_id':fields.many2one('account.account', 'Payment Account', readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
-        'pay_amount':fields.float('Payment Amount'),
+        'pay_amount':fields.float('Payment Amount', readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_id':fields.many2one('account.tax', 'Tax', required=False),
     }
     
     _defaults = {
@@ -163,14 +213,84 @@ class account_voucher(osv.osv):
         'journal_id':_get_journal,
         'currency_id': _get_currency,
         'state': lambda *a: 'draft',
-        'pay_now':lambda *a: True,
+        'pay_now':lambda *a: 'pay_now',
         'name': lambda *a: '/',
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
         'reference_type': lambda *a: "none",
         'audit': lambda *a: False,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
     }
-
+    
+    def onchange_partner_id(self, cr, uid, ids, partner_id, ttype, context={}):
+        """
+        Returns a dict that contains new values and context
+    
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param partner_id: latest value from user input for field partner_id
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        
+        @return: Returns a dict which contains new values, and context
+        """
+        move_pool = self.pool.get('account.move')
+        line_pool = self.pool.get('account.voucher.line')
+        res = []
+        
+        context.update({
+            'type':ttype, 
+            'partner_id':partner_id, 
+            'voucher':True,
+        })
+        
+        default = {
+            'value':{},
+            'context':context,
+        }
+        if not partner_id or not ttype:
+            if ids:
+                line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
+                if line_ids:
+                    line_pool.unlink(cr, uid, line_ids)
+            return default
+        
+        if ttype not in ('payment', 'receipt'):
+            return default
+        
+        if not ids:
+            raise osv.except_osv(_('Invalid !'), _('Please save voucher before selection partner !'))
+        
+        line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
+        if line_ids:
+            line_pool.unlink(cr, uid, line_ids)
+        
+        voucher_id = ids[0]
+        ids = move_pool.search(cr, uid, [('reconcile_id','=', False), ('state','=','posted'), ('partner_id','=',partner_id)], context=context)
+        for move in move_pool.browse(cr, uid, ids):
+            rs = {
+                'ref':move.ref or '/',
+                'move_id':move.id,
+                'voucher_id':voucher_id,
+            }
+            if ttype == 'payment':
+                rs.update({
+                    'account_id':move.partner_id.property_account_payable.id,
+                    'type':'dr',
+                    'amount':move.amount
+                })
+            elif ttype == 'receipt':
+                rs.update({
+                    'account_id':move.partner_id.property_account_receivable.id,
+                    'type':'cr',
+                    'amount':move.amount
+                })
+            line_id = line_pool.create(cr, uid, rs)
+            res += [line_id]
+        return {
+            'value':{'payment_ids':res},
+            'context':context,
+        }
+    
     def onchange_date(self, cr, user, ids, date, context={}):
         """
         Returns a dict that contains new values and context
@@ -486,7 +606,7 @@ class account_voucher(osv.osv):
             line_ids += [move_line_pool.create(cr, uid, move_line)]
             rec_ids = []
             
-            if inv.type == 'sale' and inv.pay_now:
+            if inv.type == 'sale' and inv.pay_now == 'pay_now':
                 if not inv.pay_account_id or not inv.pay_journal_id:
                     raise osv.except_osv(_('Payment Error !'), _('Please define Payment Journal and Account !'))
                     
@@ -606,7 +726,43 @@ class account_voucher(osv.osv):
         if 'date' not in default:
             default['date'] = time.strftime('%Y-%m-%d')
         return super(account_voucher, self).copy(cr, uid, id, default, context)
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """
+        Returns views and fields for current model where view will depend on {view_type}.
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param view_id: list of fields, which required to read signatures
+        @param view_type: defines a view type. it can be one of (form, tree, graph, calender, gantt, search, mdx)
+        @param context: context arguments, like lang, time zone
+        @param toolbar: contains a list of reports, wizards, and links related to current model
+        
+        @return: Returns a dict that contains definition for fields, views, and toolbars
+        """
+        data_pool = self.pool.get('ir.model.data')
+        journal_pool = self.pool.get('account.journal')
+        
+        voucher_type = {
+            'sale':'view_sale_receipt_form',
+            'purchase':'view_purchase_receipt_form',
+            'payment':'view_vendor_payment_form',
+            'receipt':'view_vendor_receipt_form'
+        }
 
+        if view_type == 'form':
+            tview = voucher_type.get(context.get('type'))
+            result = data_pool._get_id(cr, uid, 'account_voucher', tview)
+            view_id = data_pool.browse(cr, uid, result, context=context).res_id
+        
+        res = super(account_voucher, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        
+        #Restrict the list of journal view in search view
+        if view_type == 'search':
+            journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
+            res['fields']['journal_id']['selection'] = journal_list        
+        
+        return res
+        
 account_voucher()
 
 class account_voucher_line(osv.osv):
@@ -619,10 +775,11 @@ class account_voucher_line(osv.osv):
         'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
         'amount':fields.float('Amount'),
-        'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Type'),
+        'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
         'ref':fields.char('Reference', size=32),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
         'is_tax':fields.boolean('Tax ?', required=False),
+        'stype':fields.selection([('service','Service'),('other','Other')], 'Product Type'),
     }
     _defaults = {
         'type': lambda *a: 'cr'
@@ -704,7 +861,7 @@ class account_voucher_line(osv.osv):
 
         elif type1 in ('payment'):
             account_id = partner.property_account_payable.id
-            balance = partner.debit
+            balance = -partner.debit
             ttype = 'dr'
 
         elif type1 in ('sale'):
@@ -717,7 +874,10 @@ class account_voucher_line(osv.osv):
 
         if company.currency_id != currency:
             balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
-
+        
+        if ttype == 'dr' and balance:
+            balance = -balance
+            
         vals.update({
             'account_id': account_id,
             'type': ttype,
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
new file mode 100644
index 00000000000..b08d46d272b
--- /dev/null
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_vendor_payment_form">
+            <field name="name">account.voucher.payment.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bill Payment">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id" domain="[('type','in',['bank', 'cash'])]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payment Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Payment Lines" editable="top">
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount"/>
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_vendor_payment" model="ir.actions.act_window">
+            <field name="name">Vendor Payment</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
+            <field name="context">{'journal_type':'bank', 'type':'payment'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="16"
+            id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
+
+        <record model="ir.ui.view" id="view_vendor_receipt_form">
+            <field name="name">account.voucher.receipt.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Payment">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id" domain="[('type','in',['bank', 'cash'])]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payment Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Payment Lines" editable="top">
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount"/>
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_vendor_receipt" model="ir.actions.act_window">
+            <field name="name">Sales Payment</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
+            <field name="context">{'journal_type':'bank', 'type':'receipt'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="16"
+            id="menu_action_vendor_receipt"  parent="account.menu_finance_receivables"/>
+        
+        <record id="action_cheque_pay" model="ir.actions.act_window">
+            <field name="name">Cheques</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank']), ('type','=','payment')]</field>
+            <field name="context">{'journal_type':'bank', 'type':'payment'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_cheque_pay" icon="STOCK_JUSTIFY_FILL" sequence="16"
+            id="menu_action_cheque_pay" parent="account.menu_finance_bank_and_cash"/>
+    </data>
+</openerp>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
new file mode 100644
index 00000000000..eb90f8d97ba
--- /dev/null
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_sale_receipt_form">
+            <field name="name">account.voucher.sale.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Receipt">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id"  domain="[('type','=','sale')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Sales Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Sales Lines" editable="top">
+                                    <field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount" />
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <group col="2" colspan="1">
+                                    <separator string="Payment Options" colspan="2"/>
+                                    <field name="pay_now"/>
+                                    <field name="pay_journal_id" on_change="onchange_pay_journal(pay_journal_id,type)" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                    <field name="pay_account_id" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                    <field name="pay_amount" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                </group>
+                                <group col="2" colspan="1">
+                                    <separator string="Other Information" colspan="2"/>
+                                    <field name="reference" select="1"/>
+                                    <field name="tax_id"/>
+                                    <field name="amount"/>
+                                    <field name="date" select="1" on_change="onchange_date(date)"/>
+                                    <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <!-- Sales Voucher -->
+        <record id="action_sale_receipt" model="ir.actions.act_window">
+            <field name="name">Sales Receipt</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type','=','sale')]</field>
+            <field name="context">{'journal_type':'sale', 'type':'sale'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL"
+        action="action_sale_receipt" parent="account.menu_finance_receivables" sequence="14"/>
+        
+        <!--  Purchase Vouchers -->
+        <record model="ir.ui.view" id="view_purchase_receipt_form">
+            <field name="name">account.voucher.purchase.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Vendor Bills">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="name" colspan="4"/>
+                        <field name="journal_id"  domain="[('type','=','purchase')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
+                        <field name="number"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Bill Information">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="180">
+                                <tree string="Voucher Lines" editable="top">
+                                    <field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="amount"/>
+                                    <field name="account_id"/>
+                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                                    <field name="account_analytic_id"/>
+                                </tree>
+                            </field>
+                            <group col="2" colspan="3">
+                                <separator string="Narration" colspan="2"/>
+                                <field name="narration" colspan="2" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="1">
+                                <separator string="Other Information" colspan="2"/>
+                                <field name="reference" select="1"/>
+                                <field name="date" select="1" on_change="onchange_date(date)"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                            </group>
+                        </page>
+                        <page string="Journal Items">
+                            <group col="6" colspan="4">
+                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <separator string="Journal Items" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group col="10" colspan="4">
+                        <field name="state"/>
+                        <button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
+                        <button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
+                        <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_purchase_receipt" model="ir.actions.act_window">
+            <field name="name">Vendor Bills</field>
+            <field name="res_model">account.voucher.open</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type','=','purchase')]</field>
+            <field name="context">{'journal_type':'purchase', 'type':'purchase'}</field>
+            <field name="view_id" ref="account_open_vouchers_view"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL" 
+        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="14"/>        
+        
+    </data>
+</openerp>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index aef3c1ebb2b..f8bc28fa0ac 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -31,7 +31,7 @@
             <field name="arch" type="xml">
                 <form string="Accounting Voucher">
                     <group col="6" colspan="4">
-                        <field name="partner_id"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
                         <field name="name" colspan="4"/>
                         <field name="journal_id" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
                         <field name="account_id" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
@@ -189,19 +189,19 @@
          </record>
         
         <!--  Receipt Vouchers -->
-        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
-            <field name="name">Sales Receipt</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-            <field name="view_id" eval="view_voucher_tree"/>
-            <field name="domain">[('journal_id.type','=','sale')]</field>
-            <field name="context">{'type':'sale'}</field>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem id="menu_action_receipt_vou_voucher_list"
-        action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/>
-        
+<!--        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">-->
+<!--            <field name="name">Sales Receipt</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form,graph</field>-->
+<!--            <field name="view_id" eval="view_voucher_tree"/>-->
+<!--            <field name="domain">[('journal_id.type','=','sale')]</field>-->
+<!--            <field name="context">{'type':'sale'}</field>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem id="menu_action_receipt_vou_voucher_list"-->
+<!--        action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/>-->
+<!--        -->
         <!--  Sale Receipt Vouchers -->
 <!--        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list_pay_now">-->
 <!--            <field name="name">Sales Receipt Payment</field>-->
@@ -217,18 +217,18 @@
 <!--        action="action_receipt_vou_voucher_list_pay_now" parent="account.menu_finance_receivables" sequence="12"/>-->
 
         <!--  Purchase Vouchers -->
-        <record model="ir.actions.act_window" id="action_pay_vou_voucher_list">
-            <field name="name">Vendor Bills</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-            <field name="view_id" eval="view_voucher_tree"/>
-            <field name="domain">[('journal_id.type','=','purchase')]</field>
-            <field name="context">{'type':'purchase'}</field>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem id="menu_action_pay_vou_voucher_list"
-        action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="12"/>
+<!--        <record model="ir.actions.act_window" id="action_pay_vou_voucher_list">-->
+<!--            <field name="name">Vendor Bills</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form,graph</field>-->
+<!--            <field name="view_id" eval="view_voucher_tree"/>-->
+<!--            <field name="domain">[('journal_id.type','=','purchase')]</field>-->
+<!--            <field name="context">{'type':'purchase'}</field>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem id="menu_action_pay_vou_voucher_list"-->
+<!--        action="action_pay_vou_voucher_list" parent="account.menu_finance_payables" sequence="12"/>-->
 
         <!-- Journal Vouchers -->
         <record model="ir.actions.act_window" id="action_voucher_list">
@@ -242,50 +242,50 @@
         </record>
         <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
 
-        <record id="action_cheque_register" model="ir.actions.act_window">
-            <field name="name">Sales Payments</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
-            <field name="context">{'type':'bank'}</field>
-            <field name="view_id" ref="view_voucher_tree"/>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem action="action_cheque_register" 
-            id="menu_action_cheque_register" 
-            parent="account.menu_finance_receivables"/>
+<!--        <record id="action_cheque_register" model="ir.actions.act_window">-->
+<!--            <field name="name">Sales Payments</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form</field>-->
+<!--            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>-->
+<!--            <field name="context">{'type':'bank'}</field>-->
+<!--            <field name="view_id" ref="view_voucher_tree"/>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem action="action_cheque_register" -->
+<!--            id="menu_action_cheque_register" -->
+<!--            parent="account.menu_finance_receivables"/>-->
         
-        <record id="action_cheque_pay" model="ir.actions.act_window">
-            <field name="name">Vendor Payment</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
-            <field name="context">{'type':'bank'}</field>
-            <field name="view_id" ref="view_voucher_tree"/>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem action="action_cheque_pay" 
-            id="menu_action_cheque_pay" 
-            parent="account.menu_finance_payables"/>
+<!--        <record id="action_cheque_pay" model="ir.actions.act_window">-->
+<!--            <field name="name">Vendor Payment</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form</field>-->
+<!--            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>-->
+<!--            <field name="context">{'type':'bank'}</field>-->
+<!--            <field name="view_id" ref="view_voucher_tree"/>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem action="action_cheque_pay" -->
+<!--            id="menu_action_cheque_pay" -->
+<!--            parent="account.menu_finance_payables"/>-->
         
-        <record id="action_cheque_pay_voucher" model="ir.actions.act_window">
-            <field name="name">Cheques</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank']), ('type','=','payment')]</field>
-            <field name="context">{'type':'bank'}</field>
-            <field name="view_id" ref="view_voucher_tree"/>
-            <field name="search_view_id" ref="view_voucher_filter_new"/>
-        </record>
-        <menuitem action="action_cheque_pay_voucher" 
-            id="menu_action_cheque_pay_voucher" 
-            parent="account.menu_finance_bank_and_cash"/>
+<!--        <record id="action_cheque_pay_voucher" model="ir.actions.act_window">-->
+<!--            <field name="name">Cheques</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.voucher</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form</field>-->
+<!--            <field name="domain">[('journal_id.type', 'in', ['bank']), ('type','=','payment')]</field>-->
+<!--            <field name="context">{'type':'bank'}</field>-->
+<!--            <field name="view_id" ref="view_voucher_tree"/>-->
+<!--            <field name="search_view_id" ref="view_voucher_filter_new"/>-->
+<!--        </record>-->
+<!--        <menuitem action="action_cheque_pay_voucher" -->
+<!--            id="menu_action_cheque_pay_voucher" -->
+<!--            parent="account.menu_finance_bank_and_cash"/>-->
         
         <record model="ir.ui.view" id="view_account_journal_form_inherit">
             <field name="name">account.journal.form.inherit</field>
diff --git a/addons/account_voucher/wizard/account_voucher_open.py b/addons/account_voucher/wizard/account_voucher_open.py
index f33c00fd099..3efffe04c67 100644
--- a/addons/account_voucher/wizard/account_voucher_open.py
+++ b/addons/account_voucher/wizard/account_voucher_open.py
@@ -18,69 +18,130 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import osv, fields
+
+from osv import fields, osv
 from tools.translate import _
+import tools
 
-_types = {
-        'pay_voucher':'Cash Payment Voucher',
-        'bank_pay_voucher':'Bank Payment Voucher',
-        'rec_voucher':'Cash Receipt Voucher',
-        'bank_rec_voucher':'Bank Receipt Voucher',
-        'cont_voucher':'Contra Voucher',
-        'journal_sale_vou':'Journal Sale Voucher',
-        'journal_pur_voucher':'Journal Purchase Voucher'
-        }
-_states = {
-    'draft':'Draft',
-    'proforma':'Pro-forma',
-    'posted':'Posted',
-    'cancel':'Cancel'
-}
+class account_voucher_open(osv.osv_memory):
+    _name = "account.voucher.open"
+    _description = "Account Voucher"
+    
+    def _get_period(self, cr, uid, context={}):
+        """
+        Return  default account period value
+        """
+        ids = self.pool.get('account.period').find(cr, uid, context=context)
+        period_id = False
+        if len(ids):
+            period_id = ids[0]
+        return period_id
+
+    def _get_journal(self, cr, uid, context={}):
+        """
+        Return journal based on the journal type
+        """
+        journal_id = False
+        
+        journal_pool = self.pool.get('account.journal')
+        if context.get('journal_type', False):
+            jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
+            journal_id = jids[0]
+        return journal_id
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """
+        Returns views and fields for current model where view will depend on {view_type}.
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param view_id: list of fields, which required to read signatures
+        @param view_type: defines a view type. it can be one of (form, tree, graph, calender, gantt, search, mdx)
+        @param context: context arguments, like lang, time zone
+        @param toolbar: contains a list of reports, wizards, and links related to current model
+        
+        @return: Returns a dict that contains definition for fields, views, and toolbars
+        """
+        res = super(account_voucher_open, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
 
-class account_open_voucher(osv.osv_memory):
-    _name = "account.open.voucher"
-    _description = "Account Open Voucher"
+        if not view_id:
+            return res
 
-    _columns = {
-        'type': fields.selection([('pay_voucher','Cash Payment Voucher'),
-             ('bank_pay_voucher','Bank Payment Voucher'),
-             ('rec_voucher','Cash Receipt Voucher'),
-             ('bank_rec_voucher','Bank Receipt Voucher'),
-             ('cont_voucher','Contra Voucher'),
-             ('journal_sale_vou','Journal Sale Voucher'),
-             ('journal_pur_voucher','Journal Purchase Voucher')],'Voucher Type', required=True),
-        'state': fields.selection([('draft','Draft'),
-           ('proforma','Pro-forma'),
-           ('posted','Posted'),
-           ('cancel','Cancel')], 'State', required=True),
-        'period_ids': fields.many2many('account.period', 'voucher_period_rel', 'voucher_id', 'period_id', 'Periods'),
-    }
+        period_pool = self.pool.get('account.period')
+        journal_pool = self.pool.get('account.journal')
+        
+        journal_id = self._get_journal(cr, uid, context)
+        period_id = self._get_period(cr, uid, context)
+
+        journal = False
+        if journal_id:
+            journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
+        else:
+            journal = "All"
 
+        period = False
+        if period_id:
+            period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
+        
+        menu = self.pool.get('ir.ui.menu').browse(cr, uid, context.get('active_id'))
+        name = menu.name
+
+        view = """<?xml version="1.0" encoding="utf-8"?>
+        <form string="Standard entries">
+            <separator string="Open %s !" colspan="4"/>
+            <group colspan="4" >
+                <label width="300" string="Journal : %s"/>
+                <newline/>
+                <label width="300" string="Period :  %s"/>
+            </group>
+            <group colspan="4" col="4">
+                <label string ="" colspan="2"/>
+                <button icon="terp-gtk-go-back-rtl" string="Ok" name="action_open_window" type="object"/>
+            </group>
+        </form>""" % (str(name), str(journal), str(period))
+        
+        res.update({
+            'arch':view
+        })
+        return res
+    
     def action_open_window(self, cr, uid, ids, context=None):
-        obj_period = self.pool.get('account.period')
-        obj_fyear = self.pool.get('account.fiscalyear')
-        periods = []
+        """
+        This function Open action move line window on given period and  Journal/Payment Mode
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: account move journal’s ID or list of IDs
+        @return: dictionary of Open action move line window on given period and  Journal/Payment Mode
+        """
+        
+        period_pool = self.pool.get('account.journal.period')
+        data_pool = self.pool.get('ir.model.data')
+        journal_pool = self.pool.get('account.journal')
+        
         if context is None:
             context = {}
-
-        form = self.read(cr, uid, ids, [])[0]
-        if not form['period_ids']:
-            year = obj_fyear.find(cr, uid)
-            periods = obj_period.search(cr, uid, [('fiscalyear_id','=',year)])
-        else:
-            periods = form['period_ids']
-        return {
-            'domain': "[('type','=','%s'), ('state','=','%s'), ('period_id','in',%s)]" % (form['type'], form['state'], periods),
-            'name': "%s - %s" % (_types[form['type']], _states[form['state']]),
+        
+        journal_id = self._get_journal(cr, uid, context)
+        period_id = self._get_period(cr, uid, context)
+        
+        menu = self.pool.get('ir.ui.menu').browse(cr, uid, context.get('active_id'))
+        name = menu.name
+        
+        result = data_pool._get_id(cr, uid, 'account_voucher', 'view_voucher_filter_new')
+        res_id = data_pool.browse(cr, uid, result, context=context).res_id
+        
+        res = {
+            'domain':menu.action.domain,
+            'name': name,
             'view_type': 'form',
-            'view_mode': 'tree,form',
+            'view_mode': 'tree,graph,form',
             'res_model': 'account.voucher',
             'view_id': False,
-            'context': "{'type':'%s', 'state':'%s', 'period_id':%s}" % (form['type'], form['state'], periods),
+            'context': "{'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, period_id),
             'type': 'ir.actions.act_window',
-            'nodestroy': True
+            'search_view_id': res_id
         }
-
-account_open_voucher()
+        return res
+    
+account_voucher_open()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/wizard/account_voucher_open_view.xml b/addons/account_voucher/wizard/account_voucher_open_view.xml
index b6277e7615c..6168866b85c 100644
--- a/addons/account_voucher/wizard/account_voucher_open_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_open_view.xml
@@ -4,39 +4,23 @@
 
         <record id="account_open_vouchers_view" model="ir.ui.view">
              <field name="name">Open Vouchers</field>
-             <field name="model">account.open.voucher</field>
+             <field name="model">account.voucher.open</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Open Vouchers">
-                    <field name="type"/>
-                    <field name="state"/>
-                    <field name="period_ids" colspan="4"/>
-                    <group colspan="4" col="6">
-                           <separator colspan="6"/>
-                           <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                           <button name="action_open_window" string="Open Voucher Entries" type="object" icon="gtk-ok"/>
+                    <separator string="Open Vouchers !" colspan="4"/>
+                    <group colspan="4" >
+                        <label width="300" string="Journal :"/>
+                        <newline/>
+                        <label width="300" string="Period :"/>
+                    </group>
+                    <group colspan="4" col="4">
+                        <label string ="" colspan="2"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Ok" name="action_open_window" type="object"/>
                     </group>
                 </form>
              </field>
         </record>
-
-        <record id="action_account_open_vouchers" model="ir.actions.act_window">
-             <field name="name">Open Vouchers</field>
-             <field name="res_model">account.open.voucher</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="account_open_vouchers_view"/>
-             <field name="context">{'record_id':active_id}</field>
-            <field name="target">new</field>
-       </record>
-
-<!--       <menuitem-->
-<!--            icon="STOCK_EXECUTE"-->
-<!--            name="Open Vouchers"-->
-<!--            action="action_account_open_vouchers"-->
-<!--            id="menu_account_voucher_open"-->
-<!--            parent="menu_action_voucher_list"/>-->
-
+        
     </data>
 </openerp>
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
index 96431de6ffb..6e57e0efc12 100755
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -22,81 +22,16 @@
 from osv import fields, osv
 from tools.translate import _
 
-class account_move(osv.osv):
-    _inherit = 'account.move'
-    
-    def _get_line_ids(self, cr, uid, ids, context=None):
-        result = {}
-        for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
-            result[line.move_id.id] = True
-        return result.keys()
-    
-    def _amount_all(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        for move in self.browse(cr, uid, ids, context=context):
-            rs = {
-                'reconcile_id': False,
-            }
-            for line in move.line_id:
-                if line.reconcile_id:
-                    rs.update({
-                        'reconcile_id': line.reconcile_id.id
-                    })
-            res[move.id] = rs
-        return res
-    
-    _columns = {
-        'reconcile_id': fields.function(_amount_all, method=True, type="many2one", relation="account.move.line", string='Reconcile',
-            store={
-                'account.move.line': (_get_line_ids, [], 20),
-            },
-            multi='all'),
-    }
-    
-    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
-        """
-        Returns a list of ids based on search domain {args}
-    
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
-        @param args: list of conditions to be applied in search opertion
-        @param offset: default from first record, you can start from nth record
-        @param limit: number of records to be obtained as a result of search opertion
-        @param order: ordering on any field(s)
-        @param context: context arguments, like lang, time zone
-        @param count: 
-        
-        @return: Returns a list of ids based on search domain
-        """
-        if not context:
-            context = {}
-        ttype = context.get('ttype', False)
-        partner = context.get('partner_id', False)
-        voucher = context.get('voucher', False)
-        if voucher and not partner:
-            raise osv.except_osv(_('Invalid Partner !'), _('Please select the partner !'))
-            
-        if ttype and ttype in ('receipt'):
-            args += [('journal_id.type','in', ['sale', 'purchase_refund'])]
-        elif ttype and ttype in ('payment'):
-            args += [('journal_id.type','in', ['purchase', 'sale_refund'])]
-        elif ttype and ttype in('sale', 'purchase'):
-            raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal voucher with invoice !'))
-            args += [('journal_id.type','=', 'do_not_allow_search')]
-        res = super(account_move, self).search(cr, user, args, offset, limit, order, context, count)
-        return res
-    
-account_move()
-
-class account_move_line(osv.osv):
-    _inherit = "account.move.line"
-    _columns = {
-        'voucher_invoice': fields.many2one('account.invoice', 'Invoice', readonly=True),
-    }
-account_move_line()
+#class account_move_line(osv.osv):
+#    _inherit = "account.move.line"
+#    _columns = {
+#        'voucher_invoice': fields.many2one('account.invoice', 'Invoice', readonly=True),
+#    }
+#account_move_line()
 
 class account_voucher(osv.osv):
     _inherit = 'account.voucher'
+    
     _columns = {
         'payment_ids':fields.one2many('account.voucher.line', 'voucher_id', 'Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
     }
@@ -113,7 +48,7 @@ class account_voucher(osv.osv):
         invoice_pool = self.pool.get('account.invoice')
         
         for inv in self.browse(cr, uid, ids):
-            
+        
             if inv.move_id:
                 continue
 
@@ -181,7 +116,7 @@ class account_voucher(osv.osv):
             line_ids += [move_line_pool.create(cr, uid, move_line)]
             rec_ids = []
             
-            if inv.type == 'sale' and inv.pay_now:
+            if inv.type == 'sale' and inv.pay_now == 'pay_now':
                 #create the payment line manually
                 move_line = {
                     'name':inv.name,
@@ -198,6 +133,7 @@ class account_voucher(osv.osv):
                 line_ids += [move_line_pool.create(cr, uid, move_line)]
             else:
                 for line in inv.payment_ids:
+                    
                     amount=0.0
 
                     if inv.type in ('payment'):
@@ -234,13 +170,11 @@ class account_voucher(osv.osv):
                         move_line.update({
                             'debit': line.amount or False
                         })
-                        amount = line.amount
                     
                     elif line.type == 'cr':
                         move_line.update({
                             'credit': line.amount or False
                         })
-                        amount = line.amount
                     
                     move_line_id = move_line_pool.create(cr, uid, move_line)
                     line_ids += [move_line_id]
@@ -250,10 +184,10 @@ class account_voucher(osv.osv):
                         for move_line in line.move_id.line_id:
                             if line.account_id.id == move_line.account_id.id:
                                 rec_ids += [move_line.id]
-
+            
             if rec_ids:
                 move_line_pool.reconcile_partial(cr, uid, rec_ids)
-            
+
             rec = {
                 'move_id': move_id
             }
@@ -270,12 +204,12 @@ account_voucher()
 
 class account_voucher_line(osv.osv):
     _inherit = 'account.voucher.line'
-
+    
     def default_get(self, cr, uid, fields, context={}):
         data = super(account_voucher_line, self).default_get(cr, uid, fields, context)
         self.voucher_context = context
         return data
-
+    
     _columns = {
         'move_id' : fields.many2one('account.move','Bill / Invoice'),
     }
diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml
index de5d4aa4a8a..b634f3534e9 100755
--- a/addons/account_voucher_payment/account_voucher_payment_view.xml
+++ b/addons/account_voucher_payment/account_voucher_payment_view.xml
@@ -1,57 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_voucher_form" model="ir.ui.view">
+        
+        <record id="view_vendor_payment_form_inherit" model="ir.ui.view">
             <field name="name">account.voucher.form.inherit</field>
             <field name="model">account.voucher</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account_voucher.view_voucher_form"/>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
             <field name="arch" type="xml">
                 <field name="payment_ids" position="replace">
                     <field name="payment_ids" colspan="4" nolabel="1" height="200">
-                        <tree string="Voucher Lines" editable="top">
-<!--                            <field name="name"/>-->
+                        <tree string="Payment Lines" editable="top">
                             <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
-                            <field name="move_id" context="{'ttype':parent.type, 'partner_id':parent.partner_id, 'voucher':True}" on_change="onchange_invoice_id(move_id, parent.currency_id)" domain="[('state','=','posted'), ('partner_id','=',parent.partner_id), ('reconcile_id','=', False)]"/>
+                            <field name="move_id" string="Vendor Bill" context="{'type':parent.type, 'partner_id':parent.partner_id, 'voucher':True}" on_change="onchange_invoice_id(move_id, parent.currency_id)" domain="[('state','=','posted'), ('partner_id','=',parent.partner_id), ('reconcile_id','=', False)]"/>
                             <field name="amount"/>
-                            <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
                             <field name="account_id"/>
-                            <field name="account_analytic_id"  groups="base.group_extended"/>
+                            <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                            <field name="account_analytic_id"/>
                         </tree>
                     </field>
                 </field>
             </field>
         </record>
-
-        <record id="view_move_line_form" model="ir.ui.view">
-            <field name="name">account.move.line.form.inherit</field>
-            <field name="model">account.move.line</field>
+        
+        <record id="view_vendor_receipt_form_inherit" model="ir.ui.view">
+            <field name="name">account.voucher.form.inherit</field>
+            <field name="model">account.voucher</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_move_line_form"/>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
             <field name="arch" type="xml">
-                <field name="invoice" position="replace">
-                    <field name="voucher_invoice"/>
+                <field name="payment_ids" position="replace">
+                    <field name="payment_ids" colspan="4" nolabel="1" height="200">
+                        <tree string="Payment Lines" editable="top">
+                            <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                            <field name="move_id" string="Sales Receipt" context="{'type':parent.type, 'partner_id':parent.partner_id, 'voucher':True}" on_change="onchange_invoice_id(move_id, parent.currency_id)" domain="[('state','=','posted'), ('partner_id','=',parent.partner_id), ('reconcile_id','=', False)]"/>
+                            <field name="amount"/>
+                            <field name="account_id"/>
+                            <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
+                            <field name="account_analytic_id"/>
+                        </tree>
+                    </field>
                 </field>
             </field>
         </record>
 
-        <record id="view_move_line_tree" model="ir.ui.view">
-            <field name="name">account.move.line.form.inherit</field>
-            <field name="model">account.move.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <record model="ir.ui.view" id="view_vendor_payment_form_unreconcile">
+            <field name="name">account.voucher.form.payment.unreconcile</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_vendor_payment_form_inherit"/>
             <field name="arch" type="xml">
-                <field name="invoice" position="replace">
-                    <field name="voucher_invoice"/>
-                </field>
+                <button name="action_cancel_draft" position="before">
+                    <button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
+                </button>
             </field>
         </record>
-
-        <record model="ir.ui.view" id="view_voucher_form_one">
-            <field name="name">account.voucher.form</field>
+        
+        <record model="ir.ui.view" id="view_vendor_receipt_form_unreconcile">
+            <field name="name">account.voucher.form.receipt.unreconcile</field>
             <field name="model">account.voucher</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="view_voucher_form"/>
+            <field name="inherit_id" ref="view_vendor_receipt_form_inherit"/>
             <field name="arch" type="xml">
                 <button name="action_cancel_draft" position="before">
                     <button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
diff --git a/addons/analytic/i18n/it.po b/addons/analytic/i18n/it.po
index 7a5fd2b7c69..0d94a043b00 100644
--- a/addons/analytic/i18n/it.po
+++ b/addons/analytic/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-08-16 12:38+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 10:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@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-08-17 07:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic_journal_billing_rate/i18n/it.po b/addons/analytic_journal_billing_rate/i18n/it.po
index b718cf82988..0a128b7cb77 100644
--- a/addons/analytic_journal_billing_rate/i18n/it.po
+++ b/addons/analytic_journal_billing_rate/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 10:21+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 09:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index e3dffbd8ad8..917066a7ffb 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 6ed3c723ff4..ff8b24a9e5d 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 6aaea67dd0b..032005010e0 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -63,7 +63,7 @@
       	</field>
 		</record>
 
-		<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" groups="base.group_system,base.group_extended"/>
+		<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" groups="base.group_extended"/>
 		<menuitem name="Events Organisation" id="base.menu_event_main" parent="base.menu_association" />
 		<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
 		<menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index 675f8a7f893..15d6961e3fe 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:38+0000\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 2eeb193b763..73cbd3acb0e 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:36+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 029a2d4b4af..d490960221f 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:02+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index 798fc43c04c..c720dd79016 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 00:47+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"Last-Translator: vra (openerp) <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-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -52,17 +52,17 @@ msgstr "Crea"
 #. module: audittrail
 #: wizard_view:audittrail.view.log,init:0
 msgid "Audit Logs"
-msgstr ""
+msgstr "Log di verifica"
 
 #. module: audittrail
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "Stato"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Bozza"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
@@ -72,83 +72,83 @@ msgstr "Valore precedente"
 #. module: audittrail
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."
 
 #. module: audittrail
 #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
 msgid "View log"
-msgstr ""
+msgstr "Mostra log"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "audittrail.log.line"
-msgstr ""
+msgstr "audittrail.log.line"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "Metodo"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,from:0
 msgid "Log From"
-msgstr ""
+msgstr "Videata Logs"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "ID log"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "ID Risorsa"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Write"
-msgstr ""
+msgstr "Scrivi"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail
 msgid "Audittrails"
-msgstr ""
+msgstr "Audittrails"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "Linee di log"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribe"
-msgstr ""
+msgstr "Sottoscrivi"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Read"
-msgstr ""
+msgstr "Leggi"
 
 #. module: audittrail
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Oggetto"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "Regole tracciamento attività"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,to:0
 msgid "Log To"
-msgstr ""
+msgstr "Log a"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "Nuovo valore di testo: "
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
@@ -158,21 +158,25 @@ msgid ""
 "    Subscribe Rules for read, write, create and delete on objects and check "
 "logs"
 msgstr ""
+"Permette all'amministratore di tenere traccia di tutte le operazioni utente "
+"su tutti gli oggetti di sistema.\n"
+"    Regole che posso sottoscrivere: lettura, scrittura, creazione e "
+"cancellazione oggetti e controllo logs"
 
 #. module: audittrail
 #: field:audittrail.log,timestamp:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: audittrail
 #: field:audittrail.log,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utente"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "Vecchio valore del campo: "
 
 #. module: audittrail
 #: constraint:ir.ui.view:0
@@ -182,102 +186,102 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "Linea di log"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
 msgid "Subscribed Rules"
-msgstr ""
+msgstr "Regole applicate"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
 msgid "Fields"
-msgstr ""
+msgstr "Campi"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "Regole AuditTrail"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "audittrail.rule"
-msgstr ""
+msgstr "audittrail.rule"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "UnSubscribe"
-msgstr ""
+msgstr "Annulla sottoscrizione"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log writes"
-msgstr ""
+msgstr "Scrittura Log"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "audittrail.log"
-msgstr ""
+msgstr "audittrail.log"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "Descrizione campo"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Delete"
-msgstr ""
+msgstr "Elimina"
 
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,open:0
 msgid "Open Logs"
-msgstr ""
+msgstr "Apri logs"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value_text:0
 msgid "New value Text"
-msgstr ""
+msgstr "Nuovo Valore del campo"
 
 #. module: audittrail
 #: field:audittrail.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Nome della Regola"
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log reads"
-msgstr ""
+msgstr "Lettura Logs"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
 msgid "Logs"
-msgstr ""
+msgstr "Logs"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "Nuovo valore"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
 msgid "View Logs"
-msgstr ""
+msgstr "Guarda i Logs"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log creates"
-msgstr ""
+msgstr "Creazione Log"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "Logs di AuditTrail"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
@@ -287,24 +291,24 @@ msgstr "Regole"
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "Nuovo Valore: "
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "Vecchio valore del campo"
 
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log deletes"
-msgstr ""
+msgstr "Cancellazioni Log"
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 876ad4de4a0..a226aff41fc 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index e230156d640..d184c4bb7d6 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:24+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 47adc2ecdcd..3cb2ad64af8 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:02+0000\n"
+"PO-Revision-Date: 2010-08-18 13:25+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a0d578dffce..a735de4b823 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1111,8 +1111,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
         'recurrent_uid': fields.integer('Recurrent ID'),
         'recurrent_id': fields.datetime('Recurrent ID date'),
-        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, \
-                         string='Timezone', store=True),
+        'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
         'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
         'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a13144d495a..3a665b8a8ae 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -211,7 +211,7 @@
         <!--        Menu for Alarms-->
 
          <menuitem id="menu_crm_meeting_avail_alarm"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
 
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 85a2241aaa0..1c0525931c7 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -224,6 +224,9 @@ class res_partner_job(osv.osv):
         'state': lambda *a: 'current',
     }
     
+    def onchange_name(self, cr, uid, ids, address_id='', name='', context=None):    
+        return {'value': {'address_id': address_id}, 'domain':{'partner_id':'name'}}     
+    
     def onchange_partner(self, cr, uid, _, partner_id, context=None):
         """
             @param self: The object pointer
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index a251ca6eb90..e602968798f 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -53,7 +53,7 @@
                                <group colspan="4" col="4">
                                    <field name="sequence_contact" />
                                    <field name="function"/>
-                                   <field name="name"/> 
+                                   <field name="name" on_change="onchange_name(name,address_id)"/> 
                                    <field name="address_id"/>                                   
                                    <field name="date_start" />
                                    <field name="date_stop" />
diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po
index 078c85c0521..730aa0dcdf2 100644
--- a/addons/base_contact/i18n/it.po
+++ b/addons/base_contact/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:49+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 10:15+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 439154d10b2..258c4026c3a 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:38+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index 30192c4a008..98041e5ad3b 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:12+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index c6b091b5110..b22c7a3da96 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:45+0000\n"
+"PO-Revision-Date: 2010-08-18 13:19+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index 3579267a6a6..e15efd8046f 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:45+0000\n"
+"PO-Revision-Date: 2010-08-18 13:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index a6b4185126f..57d960ff5b6 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:39+0000\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 075701e5db4..18b7a8ff810 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:03+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/i18n/it.po b/addons/base_report_creator/i18n/it.po
index a21e6a4f0a5..327f58a01ec 100644
--- a/addons/base_report_creator/i18n/it.po
+++ b/addons/base_report_creator/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-10-06 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-08-18 13:18+0000\n"
+"Last-Translator: vra (openerp) <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-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -23,6 +23,9 @@ msgid ""
 "records.\n"
 " e.g. res_partner.id=3"
 msgstr ""
+"Fornisce una espressione per il campo basata su come vuoi filtrare i "
+"record.\n"
+"es.: res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
@@ -47,7 +50,7 @@ msgstr "Modo Grafico"
 #. module: base_report_creator
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
@@ -158,7 +161,7 @@ msgstr "Crea Menu per Report"
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Form"
-msgstr ""
+msgstr "Modulo"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type3:0
@@ -214,7 +217,7 @@ msgstr "Sicurezza"
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Nome del Menu"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
@@ -408,6 +411,12 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+"Questo modulo ti permette di creare un qualsiasi report \n"
+"statistico su vari oggetti. E' uno strumento che serve per costruire query\n"
+"SQL e per permettere all'utente finale di sfogliarne i risultati.\n"
+"\n"
+"Dopo l'installazione del modulo, viene aggiunta una voce di menù, nella "
+"sezione \"Dashboard\", per definire un Report personalizzato.\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index 185851e6a0d..03848ddae61 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:39+0000\n"
+"PO-Revision-Date: 2010-08-18 13:12+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 0361b89abed..0fa30ca1da4 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:37+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 10:11+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index 9fa19d23c28..09d23fe2810 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:16+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 3af9e68b714..a6e2227752a 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index d15a7c98181..6889099b99f 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:51+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 09:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 244898701aa..b83dda61644 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:43+0000\n"
+"PO-Revision-Date: 2010-08-18 13:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po
index a949be62f1e..570c5909120 100644
--- a/addons/board/i18n/it.po
+++ b/addons/board/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:55+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 11:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -53,7 +53,7 @@ msgstr "Larghezza"
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."
 
 #. module: board
 #: field:board.board.line,name:0
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 78c9c57fd0a..12b54a55b96 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 0839d46e6fc..dafb85f8066 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -354,6 +354,8 @@ class CalDAV(object):
                         if not model:
                             continue
                         uidval = openobjectid2uid(cr, data[map_field], model)
+                        #Computation for getting events with the same UID (RFC4791 Section4.1)
+                        #START
                         model_obj = self.pool.get(model)
                         r_ids = []
                         if model_obj._columns.get('recurrent_uid', None):
@@ -361,8 +363,13 @@ class CalDAV(object):
                                            % (model_obj._table, data[map_field]))
                             r_ids = map(lambda x: x[0], cr.fetchall())
                         if r_ids:
-                            rcal = self.export_cal(cr, uid, r_ids, 'vevent', context=context)
+                            r_datas = model_obj.read(cr, uid, r_ids, context=context)
+                            rcal = CalDAV.export_cal(self, cr, uid, r_datas, 'vevent', context=context)
+                            for revents in rcal.contents.get('vevent', []):
+                                ical.contents['vevent'].append(revents)
+                        #END
                         if data.get('recurrent_uid', None):
+                            # Change the UID value in case of modified event from any recurrent event 
                             uidval = openobjectid2uid(cr, data['recurrent_uid'], model)
                         vevent.add('uid').value = uidval
                     elif field == 'attendee' and data[map_field]:
@@ -385,6 +392,9 @@ class CalDAV(object):
                                          data[map_field], ical, context=context)
                             timezones.append(data[map_field])
                         if exfield:
+                            # Set exdates according to timezone value
+                            # This is the case when timezone mapping comes after the exdate mapping
+                            # and we have exdate value available 
                             exfield.params['TZID'] = [tzval.title()]
                             exdates_updated = []
                             for exdate in exdates:
@@ -405,6 +415,9 @@ class CalDAV(object):
                                 exfield = vevent.add(field)
                                 exdates = (data[map_field]).split(',')
                                 if tzval:
+                                    # Set exdates according to timezone value
+                                    # This is the case when timezone mapping comes before the exdate mapping
+                                    # and we have timezone value available 
                                     exfield.params['TZID'] = [tzval.title()]
                                     exdates_updated = []
                                     for exdate in exdates:
@@ -419,6 +432,7 @@ class CalDAV(object):
                         elif map_type in ('datetime', 'date') and data[map_field]:
                             dtfield = vevent.add(field)
                             if tzval:
+                                # Export the date according to the event timezone value
                                 dest_date = self.format_date_tz(data[map_field], tzval.title())
                                 dtfield.params['TZID'] = [tzval.title()]
                                 dtfield.value = parser.parse(dest_date)
@@ -499,7 +513,6 @@ class CalDAV(object):
             @param datas: Get Data's for caldav
             @param context: A standard dictionary for contextual values
         """
-
         try:
             self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
             ical = vobject.iCalendar()
@@ -581,9 +594,12 @@ class Calendar(CalDAV, osv.osv):
                 if ctx_res_id:
                     line_domain += [('id','=',ctx_res_id)]
                 mod_obj = self.pool.get(line.object_id.model)
-                data_ids = mod_obj.search(cr, uid, line_domain, context=context)
+                data_ids = mod_obj.search(cr, uid, line_domain, order="id", context=context)
                 for data in mod_obj.browse(cr, uid, data_ids, context):
                     ctx = parent and parent.context or None
+                    if data.recurrent_uid:
+                        # Skip for event which is child of other event
+                        continue
                     node = res_node_calendar('%s.ics' %data.id, parent, ctx, data, line.object_id.model, data.id)
                     res.append(node)
         return res
@@ -592,7 +608,6 @@ class Calendar(CalDAV, osv.osv):
         """ Export Calendar
             @param ids: List of calendar’s IDs
             @param vobj: the type of object to export
-            
             @return the ical data.
         """
         if not context:
@@ -627,7 +642,6 @@ class Calendar(CalDAV, osv.osv):
             @param data_id: Get Data’s ID or False
             @param context: A standard dictionary for contextual values
         """
-
         if not context:
             context = {}
         vals = []
@@ -664,6 +678,7 @@ class Calendar(CalDAV, osv.osv):
             r = self.check_import(cr, uid, vals, context=context)
             res.extend(r)
         return res
+
 Calendar()
 
 
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 3b730456f5d..0bb854fea17 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -32,7 +32,7 @@
         parent="base.menu_base_partner" sequence="1" />
 
     <menuitem parent="base.menu_sales" name="Leads"
-        groups="base.group_extended,base.group_system"
+        groups="base.group_extended"
         id="menu_crm_case_categ0_act_leads"
         action="crm_case_category_act_leads_all" sequence="1" />
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b31e7b0df9d..b70174e8989 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -14,7 +14,7 @@
     </record>
 
      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
-        groups="base.group_extended,base.group_system" sequence="0"
+        groups="base.group_extended" sequence="0"
         parent="base.menu_crm_config_lead" />
 
 
@@ -44,7 +44,7 @@
 
       <menuitem action="crm_lead_resource_act"
             id="menu_crm_lead_resource_act" name="Lead Sources"
-            groups="base.group_extended,base.group_system" sequence="2"
+            groups="base.group_extended" sequence="2"
             parent="base.menu_crm_config_lead" />
 
         <!-- CRM Lead Form View  -->
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 457670aa282..53eabcf0136 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -112,7 +112,7 @@
     <menuitem id="menu_attendee_invitations"
             name="Meeting Invitations" parent="crm.menu_meeting_sale"
             sequence="10" action="action_view_attendee_form"
-            groups="base.group_extended,base.group_sale_salesman,base.group_sale_manager" />
+            groups="base.group_extended" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index feaadc6fbcc..481e92ec134 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -57,7 +57,7 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-        groups="base.group_extended,base.group_system"
+        groups="base.group_extended"
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 423eba836b6..331dd790ab3 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -4,7 +4,7 @@
 
         <!--menuitem id="base.menu_crm_config_sales" name="Sales"
             parent="base.menu_base_config" sequence="1"/-->
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,base.group_extended,base.group_sale_manager,base.group_sale_salesman"/>
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,base.group_sale_manager,base.group_sale_salesman"/>
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
             parent="base.menu_base_config" sequence="1" groups="base.group_extended,base.group_system"/>
@@ -333,7 +333,7 @@
 
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_extended,base.group_system" sequence="2"
+            groups="base.group_extended" sequence="2"
             parent="base.menu_base_action_rule" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 1d09c7b9eeb..b9a60226fe8 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Finnish <fi@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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 91c9b1c72d9..b34dea45bbc 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-16 09:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 555891ce040..f1eca5c68ec 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-03 04:27+0000\n"
-"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"Last-Translator: vra (openerp) <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-08-12 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -193,6 +193,8 @@ msgid ""
 "Describes the action name.eg:on which object which ation to be taken on "
 "basis of which condition"
 msgstr ""
+"Descrive il nome dell'azione, ad es.: su quale oggetto, che azione deve "
+"essere presa, sulla base di che condizione"
 
 #. module: crm
 #: help:crm.case,section_id:0
@@ -200,6 +202,8 @@ msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
 msgstr ""
+"Seziona alla quale il Caso appartiene. Definisci l'utente Responsabile e "
+"l'indirizzo mail per l'invio di posta."
 
 #. module: crm
 #: view:crm.case:0
@@ -239,6 +243,8 @@ msgstr "Stipendio Proposto"
 #: help:crm.case.section,sequence:0
 msgid "Gives the sequence order when displaying a list of case sections."
 msgstr ""
+"Assegna l'ordine in funzione della Sequenza quando viene visualizzata una "
+"lista di Sezioni di Casi."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -396,7 +402,7 @@ msgstr "Prossimo colloquio"
 #. module: crm
 #: field:crm.case.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Espressione regolare nello storico del caso"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
@@ -415,6 +421,9 @@ msgid ""
 "customer. With each commercial opportunity, you can indicate the canall "
 "which is this opportunity source."
 msgstr ""
+"I canali rappresentano i differenti modi di comuncare disponibili per il "
+"cliente. Con tutte le opportunità commerciali, puoi indicare il canale che "
+"usa questa fonte di opportunità."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -498,6 +507,8 @@ msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
 msgstr ""
+"Spunta se vuoi che la regola marchi CC (mail inviata ad altre persone "
+"definite nelle azioni)."
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -817,7 +828,7 @@ msgstr "Contratto Firmato"
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Subscribe to Remote ICS"
-msgstr ""
+msgstr "Sottoscrivi l'ICS remoto"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 326c4e32d28..b6ed64d277a 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-16 09:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:20+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 2f03ed5c418..be7b1ff39f1 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-16 09:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:24+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 9765e05f1d9..91d81c9bf64 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-16 09:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:25+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index adbed246671..d29f59185c8 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
+"PO-Revision-Date: 2010-08-18 13:24+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 43e2188a6f0..c6e3f44180d 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-16 09:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 02e7601d6ce..e6b2f6af4f1 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -231,11 +231,11 @@
        </record>
 
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
-            groups="base.group_extended,base.group_sale_manager"
+            groups="base.group_extended"
            parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
-            groups="base.group_extended,base.group_sale_manager"
+            groups="base.group_extended"
            parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
 
     </data>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 66e8bd5cfa4..120bc9f859d 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -189,7 +189,7 @@
         </record>
 
         <menuitem name="Phone Calls Analysis"
-            groups="base.group_extended,base.group_sale_manager"
+            groups="base.group_extended"
             action="action_report_crm_phonecall"
             id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
 
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index f9ffc78d50d..7179a8ffdad 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -42,8 +42,6 @@
 "access_crm_case_section_custom_manager","crm.case.section.custom.manager","model_crm_case_section_custom","base.group_sale_manager",1,1,1,1
 "access_crm_case_custom_user","crm.case.custom.user","model_crm_case_custom","base.group_sale_salesman",1,1,1,1
 "access_crm_case_custom_manager","crm.case.custom.manager","model_crm_case_custom","base.group_sale_manager",1,1,1,1
-"access_crm_lead_extended","crm.lead.extended","model_crm_lead","base.group_extended",1,1,1,1
-"access_crm_phonecall_extended","crm.phonecall.extended","model_crm_phonecall","base.group_extended",1,1,1,1
 "mail_gateway_mailgate_message_user","mail_gateway.mailgate.message.user","mail_gateway.model_mailgate_message","base.group_sale_salesman",1,1,1,1
 "access_base_res_bank_system","base.res.bank system","base.model_res_bank","base.group_system",1,1,1,1
 "access_crm_case_stage_system","crm.case.stage system","model_crm_case_stage","base.group_system",1,1,1,1
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index f0ef9ae0651..3e853936541 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
             parent="base.menu_base_partner" sequence="7" />
 
         <!-- Claims Menu -->
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index b535d51c40d..37fd3ec015a 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -212,7 +212,7 @@
         </record>
 
        <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
-           groups="base.group_extended,base.group_sale_manager"
+           groups="base.group_extended"
            action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
 
 
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
index ac18ba24b78..d6c00551af0 100644
--- a/addons/crm_claim/security/ir.model.access.csv
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -2,5 +2,4 @@
 "access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,0,0,0
 "access_crm_claim_user","crm.claim.user","model_crm_claim","base.group_sale_salesman",1,1,1,0
 "access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","base.group_sale_manager",1,1,1,1
-"access_crm_claim_extended","crm.claim.extended","model_crm_claim","base.group_extended",1,1,1,1
 "access_crm_claim_system","crm.claim.system","model_crm_claim","base.group_system",1,0,0,0
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index d7115b3a3ca..3c97e662d30 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -5,7 +5,7 @@
 <!-- MENU -->
 
     <menuitem id="base.menu_fundrising" name="Fund Raising"
-        groups="base.group_extended,base.group_system"
+        groups="base.group_extended"
         parent="base.menu_base_partner" sequence="8" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 427ec0caf38..1e8b4072bab 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -3,7 +3,7 @@
     <data>
            <!-- Fund Raising Configuration Menu -->
         <menuitem id="menu_config_fundrising" name="Fund Raising"
-        groups="base.group_extended,base.group_system"
+        groups="base.group_extended"
         parent="base.menu_base_config" sequence="8" />
 
         <!-- Fund Raising Categories Form View -->
@@ -18,7 +18,7 @@
         </record>
 
         <menuitem action="crm_fund_categ_action" name="Categories"
-            id="menu_crm_case_fundraising-act" groups="base.group_extended,base.group_system"
+            id="menu_crm_case_fundraising-act" groups="base.group_extended"
             parent="menu_config_fundrising" />
 
         <!-- Fund Stage Form View -->
@@ -33,7 +33,7 @@
         </record>
 
          <menuitem action="crm_fundraising_stage_act"
-            groups="base.group_extended,base.group_system" name="Stages"
+            groups="base.group_extended" name="Stages"
             id="menu_crm_fundraising_stage_act"
             parent="menu_config_fundrising" />
 
@@ -50,7 +50,7 @@
         </record>
 
        <menuitem action="crm_fundraising_resource_act"
-            groups="base.group_extended,base.group_system" name="Resource Type"
+            groups="base.group_extended" name="Resource Type"
             id="menu_crm_fundraising_resource_act"
             parent="menu_config_fundrising" />
 
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 9d1be15afb1..a0fd2e35583 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -200,7 +200,7 @@
 
         <menuitem name="Fundraising Analysis"
             action="action_report_crm_fundraising"
-            groups="base.group_extended,base.group_sale_manager"
+            groups="base.group_extended"
             id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
 
     </data>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4a62e8b7b3a..31ba54f426f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -3,7 +3,7 @@
     <data>
        <!-- Helpdesk Support Categories Configuration Menu-->
        <menuitem id="menu_config_helpdesk" name="Helpdesk"
-        groups="base.group_extended,base.group_system"
+        groups="base.group_extended"
         parent="base.menu_base_config" sequence="7" />
 
         <!-- Helpdesk Support Categories Form View -->
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index d9ea03ad9e8..2544a506fd5 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -181,7 +181,7 @@
         </record>
 
         <menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk"
-            groups="base.group_extended,base.group_sale_manager"
+            groups="base.group_extended"
             id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
 
     </data>
diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv
index 37bbd40ab29..e7c1bbb7d89 100644
--- a/addons/crm_helpdesk/security/ir.model.access.csv
+++ b/addons/crm_helpdesk/security/ir.model.access.csv
@@ -2,5 +2,4 @@
 "access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","base.group_sale_manager",1,0,0,0
 "access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","base.group_sale_salesman",1,1,1,1
 "access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","base.group_sale_manager",1,1,1,1
-"access_crm_helpdesk_extended","crm.helpdesk.extended","model_crm_helpdesk","base.group_extended",1,1,1,1
 "access_crm_helpdesk_system","crm.helpdesk.system","model_crm_helpdesk","base.group_system",1,0,0,0
diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po
index 0240c299cca..e297887c80e 100644
--- a/addons/crm_profiling/i18n/it.po
+++ b/addons/crm_profiling/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:38+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 09:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index 9e1a449e7e8..5af7aa1052c 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:46+0000\n"
+"PO-Revision-Date: 2010-08-18 13:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 956fdd65a77..2a6ab5cd87a 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index e795c840058..0f816ecf186 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:39+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 62108a616b9..6c027b76835 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -61,7 +61,7 @@
         name="Storage Media"
         action="action_document_storage_form"
         id="menu_document_storage_media"
-        groups="base.group_extended,base.group_system"
+        groups="base.group_extended"
         parent="menu_document_management_configuration"/>
 
     <record model="ir.ui.view" id="view_document_directory_form">
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index 2eb65d2fff8..b8403e337b9 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 03:29+0000\n"
-"Last-Translator: LucaSub <subluca@gmail.com>\n"
+"PO-Revision-Date: 2010-08-18 09:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -24,12 +24,12 @@ msgstr "Data di creazione"
 #. module: document
 #: field:document.directory,ressource_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "ID Risorsa"
 
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr ""
+msgstr "Includi il nome della registrazione"
 
 #. module: document
 #: constraint:ir.model:0
@@ -47,7 +47,7 @@ msgstr "ID Modello"
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Errore! Non puoi creare Direcroty ricorsive"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_configuration
@@ -86,12 +86,12 @@ msgstr ""
 #. module: document
 #: selection:document.directory,type:0
 msgid "Other Resources"
-msgstr ""
+msgstr "Altre Risorse"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "Modello Padre"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -123,6 +123,7 @@ msgstr "Tipo di Contenuto della Cartella"
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
 msgstr ""
+"Usa un Dominio se vui applicare un filtro automatico sulle risorse visibili"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -130,6 +131,8 @@ msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
 msgstr ""
+"Spunta se vuoi usare la stessa struttura ad albero come l'oggetto "
+"selezionato nel sistema"
 
 #. module: document
 #: field:document.directory,type:0
@@ -145,7 +148,7 @@ msgstr "Strutture delle Cartelle"
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Item"
-msgstr ""
+msgstr "Articolo Padre"
 
 #. module: document
 #: view:ir.attachment:0
@@ -167,7 +170,7 @@ msgstr "Nome file Memorizzati"
 #: field:document.directory,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr ""
+msgstr "Ultimo utente che ha modificato"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -190,6 +193,8 @@ msgid ""
 "This wizard will configure the URL of the server of the document management "
 "system."
 msgstr ""
+"Questa procedura automatica configura l'URL del server del Gestore "
+"Documentale"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -202,6 +207,9 @@ msgid ""
 "If you put an object here, this directory template will appear bellow all of "
 "these objects. Don't put a parent directory if you select a parent model."
 msgstr ""
+"Se metti un oggetto qui, questo modello di directory comparirà sotto tutti "
+"questi oggetti. Non mettere una directory padre se selezioni un modello di "
+"partner."
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document
@@ -280,6 +288,10 @@ msgid ""
 "    * User Authentication\n"
 "    * Document Indexation\n"
 msgstr ""
+"Questo è un completo Sistema di Gestione Documentale:\n"
+"    * Interfaccia FTP\n"
+"    * Autenticazione Utente\n"
+"    * Indicizzazione Documenti\n"
 
 #. module: document
 #: field:document.directory,name:0
@@ -315,7 +327,7 @@ msgstr "Seq."
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
 msgid "Integrated Document Management System"
-msgstr ""
+msgstr "Sistema di gestione documentale integrato"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -332,7 +344,7 @@ msgstr "Proprietario"
 #. module: document
 #: model:ir.model,name:document.model_document_configuration_wizard
 msgid "document.configuration.wizard"
-msgstr ""
+msgstr "document.configuration.wizard"
 
 #. module: document
 #: view:ir.attachment:0
@@ -378,6 +390,8 @@ msgid ""
 "Select an object here and Open ERP will create a mapping for each of these "
 "objects, using the given domain, when browsing through FTP."
 msgstr ""
+"Seleziona un oggetto qui e Open ERP creerà un abbinamento per tutti questi "
+"oggetti, usando il dominio fornito, quando verrà sfogliato attraverso FTP."
 
 #. module: document
 #: view:ir.attachment:0
@@ -454,7 +468,7 @@ msgstr "Cancella"
 #. module: document
 #: field:ir.attachment,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: document
 #: view:document.directory:0
@@ -469,7 +483,7 @@ msgstr "Tipo di documento"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Figlio"
 
 #. module: document
 #: view:document.directory:0
@@ -537,7 +551,7 @@ msgstr "Utenti che non inviano documenti da un mese"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr ""
+msgstr "Files per Partner"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
@@ -547,93 +561,93 @@ msgstr "Questo Mese"
 #. module: document
 #: field:report.document.user,user:0 field:report.document.wall,user:0
 msgid "User"
-msgstr ""
+msgstr "Utente"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
 #: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
 msgid "All Users files"
-msgstr ""
+msgstr "Tutti i files utente"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_my_document_tree
 msgid "My files (This months)"
-msgstr ""
+msgstr "I miei files"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr ""
+msgstr "Dettaglio files per utente"
 
 #. module: document
 #: field:report.document.file,nbr:0 field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr ""
+msgstr "Num. di files"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr ""
+msgstr "File per utenti"
 
 #. module: document
 #: model:ir.module.module,shortdesc:report_document.module_meta_information
 msgid "Document Management - Reporting"
-msgstr ""
+msgstr "Gestione documentale - Stampe"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files (All months)"
-msgstr ""
+msgstr "Tutti i files degli utenti (Tutti i mesi)"
 
 #. module: document
 #: model:ir.model,name:document.model_report_document_file
 msgid "Files details by Directory"
-msgstr ""
+msgstr "Dettaglio files per Directory"
 
 #. module: document
 #: field:report.document.user,change_date:0
 #: field:report.files.partner,change_date:0
 msgid "Modified Date"
-msgstr ""
+msgstr "Data modificata"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr ""
+msgstr "Dimensione File per Mese"
 
 #. module: document
 #: field:report.document.user,file_title:0
 #: field:report.files.partner,file_title:0
 msgid "File Name"
-msgstr ""
+msgstr "Nome File"
 
 #. module: document
 #: field:report.document.file,month:0 field:report.document.user,month:0
 #: field:report.document.user,name:0 field:report.document.wall,month:0
 #: field:report.document.wall,name:0 field:report.files.partner,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mese"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr ""
+msgstr "Files per mese"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr ""
+msgstr "File per tipo di risorsa"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree
 msgid "All Users files (This month)"
-msgstr ""
+msgstr "Tutti i file degli utenti (Mese attuale)"
 
 #. module: document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr ""
+msgstr "Ora ultimo invio"
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 225b007ca9f..30a3ef39bac 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 21f756ae60b..9fb4d23e0b9 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:47+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: devcode <klaider@yandex.ru>\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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index 8e6c9825525..23a52a9867a 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:46+0000\n"
+"PO-Revision-Date: 2010-08-18 13:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 15e4a399cff..fb543513804 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:43+0000\n"
+"PO-Revision-Date: 2010-08-18 13:32+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 2f8a9146446..e9561343930 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:24+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 1cd6941a22d..263d41e2e50 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:06+0000\n"
+"PO-Revision-Date: 2010-08-18 13:24+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 5d641cb39c0..798f277580b 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -395,7 +395,11 @@ class openerp_dav_handler(dav_interface):
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             if cr: cr.close()
-            return COLLECTION
+            # at root, dbname, just return the last component
+            # of the path.
+            if uri2 and len(uri2) < 2:
+                return uri2[-1]
+            return ''
         node = self.uri2object(cr, uid, pool, uri2)
         if not node:
             if cr: cr.close()
diff --git a/addons/document_webdav/i18n/id.po b/addons/document_webdav/i18n/id.po
new file mode 100644
index 00000000000..07c070040e7
--- /dev/null
+++ b/addons/document_webdav/i18n/id.po
@@ -0,0 +1,27 @@
+# Indonesian 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-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-08-17 09:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian <id@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-08-18 10:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
diff --git a/addons/document_webdav/i18n/it.po b/addons/document_webdav/i18n/it.po
new file mode 100644
index 00000000000..8fa18b0f3d1
--- /dev/null
+++ b/addons/document_webdav/i18n/it.po
@@ -0,0 +1,31 @@
+# Italian 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-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-08-18 10:32+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Italian <it@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-08-19 03:49+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Questo è un completo Sistema di Gestione Documentale:\n"
+"\t* Interfaccia WebDat\n"
+"\t* Autenticazione Utente\n"
+"\t* Indicizzazione Documenti\n"
diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py
index 6d99e9a4492..a21bd4bec06 100644
--- a/addons/email_template/__init__.py
+++ b/addons/email_template/__init__.py
@@ -2,21 +2,21 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009  Sharoon Thomas  
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2009 Sharoon Thomas
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index aa3ea2045d2..3654f22047c 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -2,21 +2,21 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009  Sharoon Thomas  
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2009 Sharoon Thomas
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index fb7c16f69c7..39fcfcd24c4 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -2,29 +2,28 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009  Sharoon Thomas  
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2009 Sharoon Thomas
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
 import base64
 import random
-import time
-import types
 import netsvc
+import re
 
 LOGGER = netsvc.Logger()
 
@@ -58,9 +57,7 @@ except:
          _("Django templates not installed")
     )
 
-import email_template_engines
 import tools
-import report
 import pooler
 import logging
 
@@ -128,29 +125,38 @@ class email_template(osv.osv):
         'name' : fields.char('Name', size=100, required=True),
         'object_name':fields.many2one('ir.model', 'Model'),
         'model_int_name':fields.char('Model Internal Name', size=200,),
-        'enforce_from_account':fields.many2one(
+        'from_account':fields.many2one(
                    'email_template.account',
-                   string="Enforce From Account",
-                   help="Emails will be sent only from this account(which are approved)."),
-        'from_email' : fields.related('enforce_from_account', 'email_id',
-                                                type='char', string='From',
-                                                help='From Email (select mail account)',
-                                                readonly=True),        
+                   string="Email Account",
+                   help="Emails will be sent from this approved account."),
         'def_to':fields.char(
                  'Recipient (To)',
                  size=250,
                  help="The default recipient of email." 
                  "Placeholders can be used here."),
         'def_cc':fields.char(
-                 'Default CC',
+                 'CC',
                  size=250,
-                 help="The default CC for the email."
+                 help="Carbon Copy address(es), comma-separated."
                  " Placeholders can be used here."),
         'def_bcc':fields.char(
-                  'Default BCC',
+                  'BCC',
                   size=250,
-                  help="The default BCC for the email."
+                  help="Blind Carbon Copy address(es), comma-separated."
                   " Placeholders can be used here."),
+        'reply_to':fields.char('Reply-To', 
+                    size=250, 
+                    help="The address recipients should reply to,"
+                         " if different from the From address."
+                         " Placeholders can be used here."),
+        'message_id':fields.char('Message-ID', 
+                    size=250, 
+                    help="The Message-ID header value, if you need to"
+                         "specify it, for example to automatically recognize the replies later."
+                        " Placeholders can be used here."),
+        'track_campaign_item':fields.boolean('Track campaign items',
+                                help="Enable this if you want the outgoing e-mails to include a tracking"
+                                " marker that makes it possible to identify the replies an link them back to the campaign item"), 
         'lang':fields.char(
                    'Language',
                    size=250,
@@ -184,6 +190,14 @@ class email_template(osv.osv):
         'report_template':fields.many2one(
                   'ir.actions.report.xml',
                   'Report to send'),
+        'attachment_ids': fields.many2many(
+                    'ir.attachment',
+                    'email_template_attachment_rel',
+                    'email_template_id',
+                    'attachment_id',
+                    'Attached Files',
+                    help="You may attach existing files to this template, "
+                         "so they will be added in all emails created from this template"), 
         'ref_ir_act_window':fields.many2one(
                     'ir.actions.act_window',
                     'Window Action',
@@ -430,7 +444,37 @@ class email_template(osv.osv):
             result['sub_model_object_field'] = False
             result['null_value'] = null_value
         return {'value':result}
-               
+
+    def _add_attachment(self, cursor, user, mailbox_id, name, data, filename, context=None):
+        """
+        Add an attachment to a given mailbox entry.
+        
+        :param data: base64 encoded attachment data to store
+        """
+        attachment_obj = self.pool.get('ir.attachment')
+        attachment_data = {
+            'name':  (name or '') + _(' (Email Attachment)'),
+            'datas': data,
+            'datas_fname': filename,
+            'description': name or _('No Description'),
+            'res_model':'email_template.mailbox',
+            'res_id': mailbox_id,
+        }
+        attachment_id = attachment_obj.create(cursor,
+                                              user,
+                                              attachment_data,
+                                              context)
+        if attachment_id:
+            self.pool.get('email_template.mailbox').write(
+                              cursor,
+                              user,
+                              mailbox_id,
+                              {
+                               'attachments_ids':[(4, attachment_id)],
+                               'mail_type':'multipart/mixed'
+                              },
+                              context)
+
     def generate_attach_reports(self,
                                  cursor,
                                  user,
@@ -440,7 +484,7 @@ class email_template(osv.osv):
                                  context=None):
         """
         Generate report to be attached and attach it
-        to the email
+        to the email, and add any directly attached files as well.
         
         @param cursor: Database Cursor
         @param user: ID of User
@@ -452,54 +496,34 @@ class email_template(osv.osv):
         @param mail: Browse record of email object 
         @return: True 
         """
-        reportname = 'report.' + \
-            self.pool.get('ir.actions.report.xml').read(
-                                         cursor,
-                                         user,
-                                         template.report_template.id,
-                                         ['report_name'],
-                                         context)['report_name']
-        service = netsvc.LocalService(reportname)
-        data = {}
-        data['model'] = template.model_int_name
-        (result, format) = service.create(cursor,
-                                          user,
-                                          [record_id],
-                                          data,
-                                          context)
-        attachment_obj = self.pool.get('ir.attachment')
-
-        fname = tools.ustr(get_value(cursor, user, record_id,
-                                     template.file_name, template, context)
-                           or 'Report')
-        ext = '.' + format
-        if not fname.endswith(ext):
-            fname += ext
-
-        new_att_vals = {
-            'name':mail.subject + ' (Email Attachment)',
-            'datas':base64.b64encode(result),
-            'datas_fname': fname,
-            'description':mail.subject or "No Description",
-            'res_model':'email_template.mailbox',
-            'res_id':mail.id
-        }
-        attachment_id = attachment_obj.create(cursor,
+        if template.report_template:
+            reportname = 'report.' + \
+                self.pool.get('ir.actions.report.xml').read(
+                                             cursor,
+                                             user,
+                                             template.report_template.id,
+                                             ['report_name'],
+                                             context)['report_name']
+            service = netsvc.LocalService(reportname)
+            data = {}
+            data['model'] = template.model_int_name
+            (result, format) = service.create(cursor,
                                               user,
-                                              new_att_vals,
-                                              context)
-        if attachment_id:
-            self.pool.get('email_template.mailbox').write(
-                              cursor,
-                              user,
-                              mail.id,
-                              {
-                               'attachments_ids':[
-                                                  [6, 0, [attachment_id]]
-                                                    ],
-                               'mail_type':'multipart/mixed'
-                               },
-                               context)
+                                              [record_id],
+                                              data,
+                                              context)   
+            fname = tools.ustr(get_value(cursor, user, record_id,
+                                         template.file_name, template, context)
+                               or 'Report')
+            ext = '.' + format
+            if not fname.endswith(ext):
+                fname += ext
+            self._add_attachment(cursor, user, mail.id, mail.subject, base64.b64encode(result), fname, context)
+
+        if template.attachment_ids:
+            for attachment in template.attachment_ids:
+                self._add_attachment(cursor, user, mail.id, attachment.name, attachment.datas, attachment.datas_fname, context)
+
         return True
     
     def _generate_mailbox_item_from_template(self,
@@ -534,9 +558,9 @@ class email_template(osv.osv):
                                                     )
         else:
             from_account = {
-                            'id':template.enforce_from_account.id,
-                            'name':template.enforce_from_account.name,
-                            'email_id':template.enforce_from_account.email_id
+                            'id':template.from_account.id,
+                            'name':template.from_account.name,
+                            'email_id':template.from_account.email_id
                             }
         lang = get_value(cursor,
                          user,
@@ -548,9 +572,21 @@ class email_template(osv.osv):
             ctx = context.copy()
             ctx.update({'lang':lang})
             template = self.browse(cursor, user, template.id, context=ctx)
+        
+        # determine name of sender, either it is specified in email_id or we 
+        # use the account name 
+        email_id = from_account['email_id'].strip()
+        email_from = re.findall(r'([^ ,<@]+@[^> ,]+)', email_id)[0]
+        if email_from != email_id:
+            # we should keep it all, name is probably specified in the address
+            email_from = from_account['email_id']
+        else:
+            email_from = tools.ustr(from_account['name']) + "<" + tools.ustr('email_id') + ">",
+
+        # FIXME: should do this in a loop and rename template fields to the corresponding
+        # mailbox fields. (makes no sense to have different names I think.
         mailbox_values = {
-            'email_from': tools.ustr(from_account['name']) + \
-                        "<" + tools.ustr(from_account['email_id']) + ">",
+            'email_from': email_from,
             'email_to':get_value(cursor,
                                user,
                                record_id,
@@ -569,6 +605,12 @@ class email_template(osv.osv):
                                 template.def_bcc,
                                 template,
                                 context),
+            'reply_to':get_value(cursor,
+                                user,
+                                record_id,
+                                template.reply_to,
+                                template,
+                                context),
             'subject':get_value(cursor,
                                     user,
                                     record_id,
@@ -591,8 +633,13 @@ class email_template(osv.osv):
             #This is a mandatory field when automatic emails are sent
             'state':'na',
             'folder':'drafts',
-            'mail_type':'multipart/alternative' 
+            'mail_type':'multipart/alternative',
         }
+
+        if template['track_campaign_item']:
+            # get appropriate message-id 
+            mailbox_values.update(message_id=tools.misc.generate_tracking_message_id(record_id))
+
         if not mailbox_values['account_id']:
             raise Exception("Unable to send the mail. No account linked to the template.")
         #Use signatures if allowed
@@ -627,6 +674,7 @@ class email_template(osv.osv):
         if not template:
             raise Exception("The requested template could not be loaded")
         result = True
+        mailbox_obj = self.pool.get('email_template.mailbox')
         for record_id in record_ids:
             mailbox_id = self._generate_mailbox_item_from_template(
                                                                 cursor,
@@ -634,13 +682,13 @@ class email_template(osv.osv):
                                                                 template,
                                                                 record_id,
                                                                 context)
-            mail = self.pool.get('email_template.mailbox').browse(
-                                                        cursor,
-                                                        user,
-                                                        mailbox_id,
-                                                        context=context
-                                                              )
-            if template.report_template:
+            mail = mailbox_obj.browse(
+                                        cursor,
+                                        user,
+                                        mailbox_id,
+                                        context=context
+                                              )
+            if template.report_template or template.attachment_ids:
                 self.generate_attach_reports(
                                               cursor,
                                               user,
@@ -649,6 +697,7 @@ class email_template(osv.osv):
                                               mail,
                                               context
                                               )
+
             self.pool.get('email_template.mailbox').write(
                                                 cursor,
                                                 user,
@@ -662,6 +711,10 @@ class email_template(osv.osv):
 
 email_template()
 
+
+## FIXME: this class duplicates a lot of features of the email template send wizard,
+##        one of the 2 should inherit from the other!
+
 class email_template_preview(osv.osv_memory):
     _name = "email_template.preview"
     _description = "Email Template Preview"
@@ -674,10 +727,15 @@ class email_template_preview(osv.osv_memory):
         if 'template_id' in context.keys():
             ref_obj_id = self.pool.get('email.template').read(cr, uid, context['template_id'], ['object_name'], context)
             ref_obj_name = self.pool.get('ir.model').read(cr, uid, ref_obj_id['object_name'][0], ['model'], context)['model']
-            ref_obj_ids = self.pool.get(ref_obj_name).search(cr, uid, [], 0, 20, 'id desc', context=context)
-            ref_obj_recs = self.pool.get(ref_obj_name).name_get(cr, uid, ref_obj_ids, context)
-            return ref_obj_recs    
-        
+            model_obj = self.pool.get(ref_obj_name)
+            ref_obj_ids = model_obj.search(cr, uid, [], 0, 20, 'id desc', context=context)
+
+            # also add the default one if requested, otherwise it won't be available for selection:
+            default_id = context.get('default_rel_model_ref')
+            if default_id and default_id not in ref_obj_ids:
+                ref_obj_ids.insert(0, default_id)
+            return model_obj.name_get(cr, uid, ref_obj_ids, context)
+
     def _default_model(self, cursor, user, context=None):
         """
         Returns the default value for model field
@@ -701,6 +759,16 @@ class email_template_preview(osv.osv_memory):
         'to':fields.char('To', size=250, readonly=True),
         'cc':fields.char('CC', size=250, readonly=True),
         'bcc':fields.char('BCC', size=250, readonly=True),
+        'reply_to':fields.char('Reply-To', 
+                    size=250, 
+                    help="The address recipients should reply to,"
+                         " if different from the From address."
+                         " Placeholders can be used here."),
+        'message_id':fields.char('Message-ID', 
+                    size=250, 
+                    help="The Message-ID header value, if you need to"
+                         "specify it, for example to automatically recognize the replies later."
+                        " Placeholders can be used here."),
         'subject':fields.char('Subject', size=200, readonly=True),
         'body_text':fields.text('Body', readonly=True),
         'body_html':fields.text('Body', readonly=True),
@@ -728,6 +796,11 @@ class email_template_preview(osv.osv_memory):
         vals['to'] = get_value(cr, uid, rel_model_ref, template.def_to, template, context)
         vals['cc'] = get_value(cr, uid, rel_model_ref, template.def_cc, template, context)
         vals['bcc'] = get_value(cr, uid, rel_model_ref, template.def_bcc, template, context)
+        vals['reply_to'] = get_value(cr, uid, rel_model_ref, template.reply_to, template, context)
+        if template.message_id:
+            vals['message_id'] = get_value(cr, uid, rel_model_ref, template.message_id, template, context)
+        elif template.track_campaign_item:
+            vals['message_id'] = tools.misc.generate_tracking_message_id(rel_model_ref)
         vals['subject'] = get_value(cr, uid, rel_model_ref, template.def_subject, template, context)
         vals['body_text'] = get_value(cr, uid, rel_model_ref, template.def_body_text, template, context)
         vals['body_html'] = get_value(cr, uid, rel_model_ref, template.def_body_html, template, context)
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index e2ea30126c2..94393ea708c 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -2,26 +2,25 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009  Sharoon Thomas
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2009 Sharoon Thomas
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
 from osv import osv, fields
-from html2text import html2text
 import re
 import smtplib
 import base64
@@ -31,12 +30,8 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.header import decode_header, Header
 from email.utils import formatdate
-import re
 import netsvc
-import string
-import email
-import time, datetime
-import email_template_engines
+import datetime
 from tools.translate import _
 import tools
 
@@ -86,9 +81,10 @@ class email_template_account(osv.osv):
         'smtpssl':fields.boolean('SSL/TLS (only in python 2.6)',
                         states={'draft':[('readonly', False)]}, readonly=True),
         'send_pref':fields.selection([
-                                      ('html', 'HTML otherwise Text'),
-                                      ('text', 'Text otherwise HTML'),
-                                      ('both', 'Both HTML & Text')
+                                      ('html', 'HTML, otherwise Text'),
+                                      ('text', 'Text, otherwise HTML'),
+                                      ('alternative', 'Both HTML & Text (Alternative)'),
+                                      ('mixed', 'Both HTML & Text (Mixed)')
                                       ], 'Mail Format', required=True),
         'company':fields.selection([
                         ('yes', 'Yes'),
@@ -135,7 +131,10 @@ class email_template_account(osv.osv):
          'unique (email_id)',
          'Another setting already exists with this email ID !')
     ]
-    
+
+    def name_get(self, cr, uid, ids, context=None):
+        return dict([(a["id"], "%s (%s)" % (a['email_id'], a['name'])) for a in self.read(cr, uid, ids, ['name', 'email_id'], context=context)])
+
     def _constraint_unique(self, cursor, user, ids):
         """
         This makes sure that you dont give personal 
@@ -283,7 +282,7 @@ class email_template_account(osv.osv):
         TODO: Doc this
         """
         result = {'all':[]}
-        keys = ['To', 'CC', 'BCC']
+        keys = ['To', 'CC', 'BCC', 'Reply-To']
         for each in keys:
             ids_as_list = self.split_to_ids(addresses.get(each, u''))
             while u'' in ids_as_list:
@@ -292,7 +291,7 @@ class email_template_account(osv.osv):
             result['all'].extend(ids_as_list)
         return result
     
-    def send_mail(self, cr, uid, ids, addresses, subject='', body=None, payload=None, context=None):
+    def send_mail(self, cr, uid, ids, addresses, subject='', body=None, payload=None, message_id=None, context=None):
         #TODO: Replace all this with a single email object
         if body is None:
             body = {}
@@ -306,18 +305,38 @@ class email_template_account(osv.osv):
             serv = self.smtp_connection(cr, uid, id)
             if serv:
                 try:
-                    msg = MIMEMultipart()
+                    # Prepare multipart containers depending on data
+                    text_subtype = (core_obj.send_pref == 'alternative') and 'alternative' or 'mixed'
+                    # Need a multipart/mixed wrapper for attachments if content is alternative
+                    if payload and text_subtype == 'alternative':
+                        payload_part = MIMEMultipart(_subtype='mixed')
+                        text_part = MIMEMultipart(_subtype=text_subtype)
+                        payload_part.attach(text_part)
+                    else:
+                        # otherwise a single multipart/mixed will do the whole job 
+                        payload_part = text_part = MIMEMultipart(_subtype=text_subtype)
+
                     if subject:
-                        msg['Subject'] = subject
-                    sender_name = Header(core_obj.name, 'utf-8').encode()
-                    msg['From'] = sender_name + " <" + core_obj.email_id + ">"
-                    msg['Organization'] = tools.ustr(core_obj.user.company_id.name)
-                    msg['Date'] = formatdate()
+                        payload_part['Subject'] = subject
+                    from_email = core_obj.email_id
+                    if '<' in from_email:
+                        # We have a structured email address, keep it untouched
+                        payload_part['From'] = Header(core_obj.email_id, 'utf-8').encode()
+                    else:
+                        # Plain email address, construct a structured one based on the name:
+                        sender_name = Header(core_obj.name, 'utf-8').encode()
+                        payload_part['From'] = sender_name + " <" + core_obj.email_id + ">"
+                    payload_part['Organization'] = tools.ustr(core_obj.user.company_id.name)
+                    payload_part['Date'] = formatdate()
                     addresses_l = self.get_ids_from_dict(addresses) 
                     if addresses_l['To']:
-                        msg['To'] = u','.join(addresses_l['To'])
+                        payload_part['To'] = u','.join(addresses_l['To'])
                     if addresses_l['CC']:
-                        msg['CC'] = u','.join(addresses_l['CC'])
+                        payload_part['CC'] = u','.join(addresses_l['CC'])
+                    if addresses_l['Reply-To']:
+                        payload_part['Reply-To'] = addresses_l['Reply-To'][0]
+                    if message_id:
+                        payload_part['Message-ID'] = message_id
                     if body.get('text', False):
                         temp_body_text = body.get('text', '')
                         l = len(temp_body_text.replace(' ', '').replace('\r', '').replace('\n', ''))
@@ -326,28 +345,30 @@ class email_template_account(osv.osv):
                     # Attach parts into message container.
                     # According to RFC 2046, the last part of a multipart message, in this case
                     # the HTML message, is best and preferred.
-                    if core_obj.send_pref == 'text' or core_obj.send_pref == 'both':
-                        body_text = body.get('text', u'No Mail Message')
+                    if core_obj.send_pref in ('text', 'mixed', 'alternative'):
+                        body_text = body.get('text', u'<Empty Message>')
                         body_text = tools.ustr(body_text)
-                        msg.attach(MIMEText(body_text.encode("utf-8"), _charset='UTF-8'))
-                    if core_obj.send_pref == 'html' or core_obj.send_pref == 'both':
+                        text_part.attach(MIMEText(body_text.encode("utf-8"), _charset='UTF-8'))
+                    if core_obj.send_pref in ('html', 'mixed', 'alternative'):
                         html_body = body.get('html', u'')
                         if len(html_body) == 0 or html_body == u'':
-                            html_body = body.get('text', u'<p>No Mail Message</p>').replace('\n', '<br/>').replace('\r', '<br/>')
+                            html_body = body.get('text', u'<p>&lt;Empty Message&gt;</p>').replace('\n', '<br/>').replace('\r', '<br/>')
                         html_body = tools.ustr(html_body)
-                        msg.attach(MIMEText(html_body.encode("utf-8"), _subtype='html', _charset='UTF-8'))
-                    #Now add attachments if any
-                    for file in payload.keys():
-                        part = MIMEBase('application', "octet-stream")
-                        part.set_payload(base64.decodestring(payload[file]))
-                        part.add_header('Content-Disposition', 'attachment; filename="%s"' % file)
-                        Encoders.encode_base64(part)
-                        msg.attach(part)
+                        text_part.attach(MIMEText(html_body.encode("utf-8"), _subtype='html', _charset='UTF-8'))
+
+                    #Now add attachments if any, wrapping into a container multipart/mixed if needed
+                    if payload:
+                        for file in payload:
+                            part = MIMEBase('application', "octet-stream")
+                            part.set_payload(base64.decodestring(payload[file]))
+                            part.add_header('Content-Disposition', 'attachment; filename="%s"' % file)
+                            Encoders.encode_base64(part)
+                            payload_part.attach(part)
                 except Exception, error:
                     logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:MIME Error\nDescription: %s") % (id, error))
                     return {'error_msg': "Server Send Error\nDescription: %s"%error}
                 try:
-                    serv.sendmail(msg['From'], addresses_l['all'], msg.as_string())
+                    serv.sendmail(payload_part['From'], addresses_l['all'], payload_part.as_string())
                 except Exception, error:
                     logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Server Send Error\nDescription: %s") % (id, error))
                     return {'error_msg': "Server Send Error\nDescription: %s"%error}
@@ -358,7 +379,7 @@ class email_template_account(osv.osv):
             else:
                 logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id)
                 return {'error_msg':"Mail from Account %s failed. Probable Reason:Account not approved"% id}
-                                
+
     def extracttime(self, time_as_string):
         """
         TODO: DOC THis
diff --git a/addons/email_template/email_template_engines.py b/addons/email_template/email_template_engines.py
index 01811eb9b56..5ac60b02014 100644
--- a/addons/email_template/email_template_engines.py
+++ b/addons/email_template/email_template_engines.py
@@ -2,29 +2,25 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009  Sharoon Thomas  
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2009 Sharoon Thomas
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-from osv import fields,osv
-import pooler
-import netsvc
+from osv import osv
 import re
 
 class email_template_engines(osv.osv):
@@ -35,7 +31,7 @@ class email_template_engines(osv.osv):
         pass
         
     def strip_html(self,text):
-        #Removes HTML, Have to check if still relevent
+        #Removes HTML, Have to check if still relevant
         if text:
             def fixup(m):
                 text = m.group(0)
@@ -69,7 +65,6 @@ class email_template_engines(osv.osv):
         #templateid: the template id of the template
         #context: TODO
         if message:
-            logger = netsvc.Logger()
             def merge(match):
                 template = self.pool.get("email.template").browse(cr,uid,templateid,context)
                 obj_pool = self.pool.get(template.object_name.model)
diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index 3348ab4ca2a..015d8ec297e 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -2,27 +2,26 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009  Sharoon Thomas  
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2009 Sharoon Thomas
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
 from osv import osv, fields
 import time
-import email_template_engines
 import netsvc
 from tools.translate import _
 import tools
@@ -75,10 +74,15 @@ class email_template_mailbox(osv.osv):
                         payload[attachment.datas_fname] = attachment.datas
                 result = account_obj.send_mail(cr, uid,
                               [values['account_id'][0]],
-                              {'To':values.get('email_to', u'') or u'', 'CC':values.get('email_cc', u'') or u'', 'BCC':values.get('email_bcc', u'') or u''},
+                              {'To':values.get('email_to') or u'',
+                               'CC':values.get('email_cc') or u'',
+                               'BCC':values.get('email_bcc') or u'',
+                               'Reply-To':values.get('reply_to') or u''},
                               values['subject'] or u'',
-                              {'text':values.get('body_text', u'') or u'', 'html':values.get('body_html', u'') or u''},
-                              payload=payload, context=context)
+                              {'text':values.get('body_text') or u'', 'html':values.get('body_html') or u''},
+                              payload=payload,
+                              message_id=values['message_id'], 
+                              context=context)
                 if result == True:
                     self.write(cr, uid, id, {'folder':'sent', 'state':'na', 'date_mail':time.strftime("%Y-%m-%d %H:%M:%S")}, context)
                     self.historise(cr, uid, [id], "Email sent successfully", context)
@@ -88,7 +92,7 @@ class email_template_mailbox(osv.osv):
                     
             except Exception, error:
                 logger = netsvc.Logger()
-                logger.notifyChannel(_("Power Email"), netsvc.LOG_ERROR, _("Sending of Mail %s failed. Probable Reason:Could not login to server\nError: %s") % (id, error))
+                logger.notifyChannel("email-template", netsvc.LOG_ERROR, _("Sending of Mail %s failed. Probable Reason:Could not login to server\nError: %s") % (id, error))
                 self.historise(cr, uid, [id], error, context)
             self.write(cr, uid, id, {'state':'na'}, context)
         return result
@@ -103,21 +107,27 @@ class email_template_mailbox(osv.osv):
                             'From', 
                             size=64),
             'email_to':fields.char(
-                            'Recepient (To)', 
+                            'Recipient (To)', 
                             size=250,),
             'email_cc':fields.char(
-                            ' CC', 
+                            'CC', 
                             size=250),
             'email_bcc':fields.char(
-                            ' BCC', 
+                            'BCC', 
+                            size=250),
+            'reply_to':fields.char(
+                            'Reply-To', 
+                            size=250),
+            'message_id':fields.char(
+                            'Message-ID', 
                             size=250),
             'subject':fields.char(
-                            ' Subject', 
+                            'Subject', 
                             size=200,),
             'body_text':fields.text(
                             'Standard Body (Text)'),
             'body_html':fields.text(
-                            'Body (Text-Web Client Only)'),
+                            'Body (Rich Text Clients Only)'),
             'attachments_ids':fields.many2many(
                             'ir.attachment', 
                             'mail_attachments_rel', 
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index a49fabbd523..ce1b5ee6059 100644
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -8,14 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Outbox">
-                    <group col="4" colspan="2">
-                        <field name="email_from" colspan="4" select="1"/>
-                        <field name="email_cc" colspan="4" select="1"/>
-                        <field name="date_mail" colspan="4" select="2"/>
-                    </group>
-                    <group col="4" colspan="2">
-                        <field name="email_to" colspan="4" required="1" select="1" />
-                        <field name="email_bcc" colspan="4" select="2"/>
+                    <group col="4" colspan="4" name="headers">
+                        <field name="email_from" select="1"/>
+                        <field name="email_to" required="1" select="1" />
+                        <field name="reply_to" select="2"/>
+                        <field name="email_cc" select="1"/>
+                        <field name="email_bcc" select="2"/>
+                        <field name="date_mail" select="2"/>
                         <field name="subject" colspan="4" select="1"/>
                     </group>
                     <notebook colspan="4">
@@ -46,6 +45,7 @@
                                 <field name="server_ref" colspan="2" />
                                 <field name="mail_type" colspan="2" />
                                 <field name="folder" colspan="2" select="2"/>
+                                <field name="message_id" select="2"/>
                                 <separator string="History" colspan="4" />
                                 <field name="history" nolabel="1" colspan="4"/>
                             </group>
@@ -83,7 +83,7 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Mailboxes">
-                    <filter icon="terp-mail-message-new" string="Drafts" name="draft" domain="[('folder','=','drafts']"/>
+                    <filter icon="terp-mail-message-new" string="Drafts" name="draft" domain="[('folder','=','drafts')]"/>
                     <filter icon="terp-mail-" string="Outbox" name="outbox" domain="[('folder','=','outbox')]"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-gtk-jump-to-ltr" string="Sent" domain="[('folder','=','sent')]"/>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 3346c6c6162..79867a5bff3 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -16,7 +16,9 @@
                         <field name="to" />
                         <field name="cc" />
                         <field name="bcc" />
-                        <field name="subject" />
+                        <field name="reply_to" />
+                        <field name="message_id" attrs="{'invisible':[('message_id','=',False)]}" groups="base.group_extended"/>
+                        <field name="subject" colspan="8"/>
                     </group>
                     <group col="4" colspan="4">
                         <separator string= "Body(Text)" colspan="2"/>   
@@ -58,17 +60,18 @@
                         <page string="Mail Details">
                             <group col="2" colspan="2">
                                 <separator string="Addresses" colspan="2"/>
-                                <field name="from_email"/>
+                                <field name="from_account" required="1"/>
                                 <field name="def_to" required="1"/>
                                 <field name="def_cc"/>
                                 <field name="def_bcc"/>
+                                <field name="reply_to"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="Email Data" colspan="2"/>
-                                <field name="enforce_from_account" required= "1"/>
                                 <field name="def_subject" colspan="4" required="1" />
                                 <field name="use_sign" colspan="4" />
                                 <field name="lang" colspan="4" />
+                                <field name="track_campaign_item" colspan="4"/>
                             </group>
                             <separator colspan="3" string="Standard Body" />
                             <separator colspan="1" string="Expression Builder" />
@@ -116,10 +119,17 @@
                                 <button name="delete_action" string="Delete Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
                             </group>
                             <group colspan="2" col="2">
-                                <separator string="Attachments (Report to attach)" colspan="4"/>
-                                <field name="file_name" colspan="2" />
-                                <field name="report_template" colspan="2"
-                                    domain="[('model','=',model_int_name)]" />
+                                <separator string="Attachments" colspan="2"/>
+                                <notebook>
+                                    <page string="Existing files">
+                                        <field name="attachment_ids" colspan="4" nolabel="1"/>
+                                    </page>
+                                    <page string="Report">
+                                        <field name="file_name" colspan="4" />
+                                        <field name="report_template" colspan="4"
+                                            domain="[('model','=',model_int_name)]" />
+                                    </page>
+                                </notebook>
                             </group>
                         </page>
                     </notebook>
@@ -141,7 +151,7 @@
                     <field name="def_subject" colspan="4" select="2" />
                     <field name="use_sign" colspan="4" select="2" />
                     <field name="file_name" colspan="4" />
-                    <field name="enforce_from_account" />
+                    <field name="from_account" />
                 </tree>
             </field>
         </record>
diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py
index f8be00adf0f..af7848fee2d 100644
--- a/addons/email_template/html2text.py
+++ b/addons/email_template/html2text.py
@@ -9,7 +9,7 @@ __contributors__ = ["Martin 'Joey' Schulze", "Ricardo Reyes", "Kevin Jay North"]
 #   Support decoded entities with unifiable.
 
 if not hasattr(__builtins__, 'True'): True, False = 1, 0
-import re, sys, urllib, htmlentitydefs, codecs, StringIO, types
+import re, sys, urllib, htmlentitydefs, codecs
 import sgmllib
 import urlparse
 sgmllib.charref = re.compile('&#([xX]?[0-9a-fA-F]+)[^0-9a-fA-F]')
diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py
index ea6fcfbcd86..eb7cd23f704 100755
--- a/addons/email_template/wizard/__init__.py
+++ b/addons/email_template/wizard/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009 Sharoon Thomas
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
 import email_template_send_wizard
diff --git a/addons/email_template/wizard/email_template_send_wizard.py b/addons/email_template/wizard/email_template_send_wizard.py
index 4b1aba3a2aa..73cf5af6ede 100755
--- a/addons/email_template/wizard/email_template_send_wizard.py
+++ b/addons/email_template/wizard/email_template_send_wizard.py
@@ -1,13 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009 Sharoon Thomas
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
 from osv import osv, fields
 from mako.template import Template
 from mako import exceptions
 import netsvc
 import base64
-import time
 from tools.translate import _
 import tools
 from email_template.email_template import get_value
 
+
+## FIXME: this wizard duplicates a lot of features of the email template preview,
+##        one of the 2 should inherit from the other!
+
 class email_template_send_wizard(osv.osv_memory):
     _name = 'email_template.send.wizard'
     _description = 'This is the wizard for sending mail'
@@ -23,16 +48,16 @@ class email_template_send_wizard(osv.osv_memory):
 
         logger = netsvc.Logger()
 
-        if template.enforce_from_account:
-            return [(template.enforce_from_account.id, '%s (%s)' % (template.enforce_from_account.name, template.enforce_from_account.email_id))]
+        if template.from_account:
+            return [(template.from_account.id, '%s (%s)' % (template.from_account.name, template.from_account.email_id))]
         else:
             account_id = self.pool.get('email_template.account').search(cr,uid,[('company','=','no'),('user','=',uid)], context=context)
             if account_id:
                 account = self.pool.get('email_template.account').browse(cr,uid,account_id, context)
                 return [(r.id,r.name + " (" + r.email_id + ")") for r in account]
             else:
-               logger.notifyChannel(_("Power Email"), netsvc.LOG_ERROR, _("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal power email account."))
-               raise osv.except_osv(_("Power Email"),_("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal power email account."))
+                logger.notifyChannel(_("email-template"), netsvc.LOG_ERROR, _("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal email account."))
+                raise osv.except_osv(_("Missing mail account"),_("No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal email account."))
 
     def get_value(self, cursor, user, template, message, context=None, id=None):
         """Gets the value of the message parsed with the content of object id (or the first 'src_rec_ids' if id is not given)"""
@@ -91,6 +116,16 @@ class email_template_send_wizard(osv.osv_memory):
         'to':fields.char('To',size=250,required=True),
         'cc':fields.char('CC',size=250,),
         'bcc':fields.char('BCC',size=250,),
+        'reply_to':fields.char('Reply-To', 
+                    size=250, 
+                    help="The address recipients should reply to,"
+                         " if different from the From address."
+                         " Placeholders can be used here."),
+        'message_id':fields.char('Message-ID', 
+                    size=250, 
+                    help="The Message-ID header value, if you need to"
+                         "specify it, for example to automatically recognize the replies later."
+                        " Placeholders can be used here."),
         'subject':fields.char('Subject',size=200),
         'body_text':fields.text('Body',),
         'body_html':fields.text('Body',),
@@ -103,6 +138,7 @@ class email_template_send_wizard(osv.osv_memory):
         'attachment_ids': fields.many2many('ir.attachment','send_wizard_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
     }
 
+    #FIXME: probably better by overriding default_get directly 
     _defaults = {
         'state': lambda self,cr,uid,ctx: len(ctx['src_rec_ids']) > 1 and 'multi' or 'single',
         'rel_model': lambda self,cr,uid,ctx: self.pool.get('ir.model').search(cr,uid,[('model','=',ctx['src_model'])],context=ctx)[0],
@@ -116,8 +152,11 @@ class email_template_send_wizard(osv.osv_memory):
         'report': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'file_name', ctx),
         'signature': lambda self,cr,uid,ctx: self._get_template(cr, uid, ctx).use_sign,
         'ref_template':lambda self,cr,uid,ctx: self._get_template(cr, uid, ctx).id,
+        'reply_to': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'reply_to', ctx),
+        'reply_to': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'reply_to', ctx),
         'requested':lambda self,cr,uid,ctx: len(ctx['src_rec_ids']),
-        'full_success': lambda *a: False
+        'full_success': False,
+        'attachment_ids': [], 
     }
 
     def fields_get(self, cr, uid, fields=None, context=None, write_access=True):
@@ -153,13 +192,13 @@ class email_template_send_wizard(osv.osv_memory):
             mail_ids = self.save_to_mailbox(cr, uid, ids, context)
             if mail_ids:
                 self.pool.get('email_template.mailbox').write(cr, uid, mail_ids, {'folder':'outbox'}, context)
-                logger.notifyChannel(_("Power Email"), netsvc.LOG_INFO, _("Emails for multiple items saved in outbox."))
+                logger.notifyChannel("email-template", netsvc.LOG_INFO, _("Emails for multiple items saved in outbox."))
                 self.write(cr, uid, ids, {
                     'generated':len(mail_ids),
                     'state':'done'
                 }, context)
             else:
-                raise osv.except_osv(_("Power Email"),_("Email sending failed for one or more objects."))
+                raise osv.except_osv(_("Email Template"),_("Email sending failed for one or more objects."))
         return True
      
     def save_to_mailbox(self, cr, uid, ids, context=None):
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
index 3a26f691fa9..42f49a10911 100644
--- a/addons/event/i18n/it.po
+++ b/addons/event/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 06:14+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 10:04+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
@@ -130,6 +130,20 @@ msgid ""
 "event or per event category in :\n"
 "                Events / Reporting\n"
 msgstr ""
+"Organizzazione e gestione degli eventi.\n"
+"\n"
+"    Questo modulo ti permette\n"
+"        * di gestire i tuoi eventi e le loro registrazioni\n"
+"        * di usare le e-mail per confermare automaticamente e inviare "
+"l'attestazione per ogni registrazione ad un evento\n"
+"        * ...\n"
+"\n"
+"    Da notare che:\n"
+"    - Puoi definire nuovi tipi di eventi in\n"
+"                Eventi / Configurazione / Tipi di eventi\n"
+"    - Puoi accedere a dei report predefiniti circa il numero di "
+"registrazioni per eventi, o per categoria di eventi in:\n"
+"                Eventi / Reporting\n"
 
 #. module: event
 #: view:event.registration:0
@@ -247,7 +261,7 @@ msgstr "Configurazione"
 #. module: event
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
+msgstr "XML non valido per visualizzare l'Achitettura!"
 
 #. module: event
 #: wizard_button:event.confirm_registration,split,confirm:0
@@ -510,7 +524,7 @@ msgstr "Prezzo Unitario"
 #. module: event
 #: model:crm.case.section,name:event.event_2_crm_case_section
 msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "Conferenza su Affari con ERP"
 
 #. module: event
 #: field:event.registration,badge_partner:0
@@ -626,7 +640,7 @@ msgstr "Lista Registrazioni dei Partner"
 #. module: event
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Errore: codice EAN non valido"
+msgstr "Errore:.Codice EAN non valido"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 9156559da62..2c4184417e3 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 10:38+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 10:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 1c525ac9601..a90930f4046 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:30+0000\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index 7da6110a78b..d80733593d8 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:18+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index be0d5351fcc..15c7dea6c32 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
+"PO-Revision-Date: 2010-08-18 13:35+0000\n"
 "Last-Translator: adsiz_1029@hotmail.com <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 605303f01d8..fa5239b4e84 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index 59df02033be..e2a9a4529a1 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:19+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Finnish <fi@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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po
index 68d1aa6c25d..ef5617dbce0 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 05:30+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:27+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -87,7 +87,7 @@ msgstr "Nome Dipendente"
 #: wizard_button:hr.attendance.print_month,init,print:0
 #: wizard_button:hr.attendance.print_week,init,print:0
 msgid "Print Timesheet"
-msgstr ""
+msgstr "Stampa il Cartellino"
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error
@@ -102,7 +102,7 @@ msgstr "Nome di modello non valido nella definizione dell'azione."
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_week
 msgid "Print Timesheet by week"
-msgstr ""
+msgstr "Stampa il Cartellino per settimana"
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
@@ -113,7 +113,7 @@ msgstr "Dipendente"
 #: wizard_view:hr.attendance.print_week,init:0
 #: wizard_view:hr.attendance.report,init:0
 msgid "Select a time span"
-msgstr ""
+msgstr "Seleziona un periodo di tempo"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
@@ -165,7 +165,7 @@ msgstr "Giugno"
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_month
 msgid "Print Timesheet by month"
-msgstr ""
+msgstr "Stampa il Cartellino per mese"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -223,7 +223,7 @@ msgstr "Motivo Presenza"
 #: wizard_field:hr.attendance.print_week,init,init_date:0
 #: wizard_field:hr.attendance.report,init,init_date:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data di inizio"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
@@ -275,7 +275,7 @@ msgstr "Entrata"
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
 msgid "Analysis Information"
-msgstr ""
+msgstr "Analisi dell'informazione"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,init,state:0
@@ -313,7 +313,7 @@ msgstr "Azione"
 #. module: hr_attendance
 #: wizard_button:hr.attendance.report,init,print:0
 msgid "Print Attendance Report"
-msgstr ""
+msgstr "Stampa Report Presenze"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
@@ -329,7 +329,7 @@ msgstr "Novembre"
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
 msgid "Bellow this delay, the error is considered to be voluntary"
-msgstr ""
+msgstr "Al di sotto di questo ritardo, l'errore è da considerarsi volontario"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.report,init,max_delay:0
@@ -339,13 +339,13 @@ msgstr "Ritardo Massimo (min.)"
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_week,init:0
 msgid "Select a starting and a end date"
-msgstr ""
+msgstr "Seleziona una data di inizio e una di fine"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_week,init,end_date:0
 #: wizard_field:hr.attendance.report,init,end_date:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data finale"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,so_ask_si:0
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index 7e7d088d930..d4a3ec5dd78 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:30+0000\n"
+"PO-Revision-Date: 2010-08-18 13:16+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index 35d9e18f454..86e7ab32edb 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:47+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
index c2cca548426..bca3ca2401c 100644
--- a/addons/hr_contract/i18n/it.po
+++ b/addons/hr_contract/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 17:42+0000\n"
-"Last-Translator: Mario Riva <mario.riva@domsense.com>\n"
+"PO-Revision-Date: 2010-08-18 10:09+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -58,7 +58,7 @@ msgstr "Tipi Retribuzione"
 #. module: hr_contract
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."
 
 #. module: hr_contract
 #: field:hr.contract,employee_id:0
@@ -73,7 +73,7 @@ msgstr "Netto"
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
 msgid "Human Resources Contracts"
-msgstr ""
+msgstr "Contratti Risorse Umane"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,factor_days:0
@@ -189,7 +189,7 @@ msgstr "Periodo Retribuzione"
 #. module: hr_contract
 #: field:hr.employee,audiens_num:0
 msgid "AUDIENS Number"
-msgstr ""
+msgstr "Numero AUDIENS"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index 8b7abf610f4..beaae108c7e 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
+"PO-Revision-Date: 2010-08-18 13:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 9a9456c4c89..918874de719 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:24+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 7be26dc2c10..86743bebab1 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 253f6c22fb7..0bdf798f896 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -7,71 +7,71 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-08-18 13:25+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "New Holidays Request"
-msgstr ""
+msgstr "Nuova richiesta di ferie"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
 msgid "All Holidays Requests"
-msgstr ""
+msgstr "Tutte le richieste di ferie"
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome modello non valido nella definizione dell'azione."
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr ""
+msgstr "Permessi rimanenti"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
 msgid "Requests Awaiting for Validation"
-msgstr ""
+msgstr "Richieste in attesa di validazione"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
-msgstr ""
+msgstr "Blu Chiaro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr ""
+msgstr "Marrone"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "of the"
-msgstr ""
+msgstr "del/dei"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Off-Days' Summary"
-msgstr ""
+msgstr "Riepilogo giorni di assenza"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
 msgid "Employee Holidays"
-msgstr ""
+msgstr "Ferie del dipentente"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Imposta come Bozza"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
@@ -79,27 +79,27 @@ msgstr ""
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidays0
 msgid "Holidays"
-msgstr ""
+msgstr "Ferie"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "to"
-msgstr ""
+msgstr "a"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Cyan"
-msgstr ""
+msgstr "Azzurro Chiaro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Green"
-msgstr ""
+msgstr "Verde chiaro"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
 msgid "Employee Declaration"
-msgstr ""
+msgstr "Dichiarazione del dipendente"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -111,7 +111,7 @@ msgstr "Convalida"
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
 msgid "Refused Request"
-msgstr ""
+msgstr "Richiesta rifiutata"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_approved0
@@ -121,113 +121,113 @@ msgstr "Approvato"
 #. module: hr_holidays
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Both"
-msgstr ""
+msgstr "Entrambe"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Refuse"
-msgstr ""
+msgstr "Rifiuta"
 
 #. module: hr_holidays
 #: wizard_button:hr.holidays.summary,notify,end:0
 #: wizard_button:hr.holidays.summary.employee,notify,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
 msgid "My Holidays Requests"
-msgstr ""
+msgstr "Le Mie Richieste di Ferie"
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
 #: field:hr.holidays.per.user,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Annotazioni"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status:0
 #: field:hr.holidays.log,holiday_status:0
 #: field:hr.holidays.per.user,holiday_status:0
 msgid "Holiday's Status"
-msgstr ""
+msgstr "Stato delle Ferie"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
 msgid "Request is refused."
-msgstr ""
+msgstr "La richiesta è stata rifiutata"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Holidays Management"
-msgstr ""
+msgstr "Gestione Ferie"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Analyze from"
-msgstr ""
+msgstr "Analizza da"
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Holidays"
-msgstr ""
+msgstr "Riepilogo delle Ferie"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_calendar0
 msgid "The holiday is set in the calendar"
-msgstr ""
+msgstr "Le ferie sono state impostate nel calendario"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Holiday status"
-msgstr ""
+msgstr "Stato delle Ferie"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Holidays Status"
-msgstr ""
+msgstr "Stato delle Ferie"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "Vacation end day"
-msgstr ""
+msgstr "Ultimo giorno di Ferie"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "Holidays Allowed"
-msgstr ""
+msgstr "Ferie Accordate"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_legaldeclaration0
 msgid "Legal Declaration Document to declare new employee"
-msgstr ""
+msgstr "Documento a validità legale per dichiarare un nuovo impiegato"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr ""
+msgstr "Magenta"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
 msgid "Holidays Per User"
-msgstr ""
+msgstr "Ferie per Utente"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Define holiday status"
-msgstr ""
+msgstr "Definisci lo Stato delle Ferie"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confermato"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,date_from:0
 #: wizard_field:hr.holidays.summary.employee,init,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Da"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -239,73 +239,73 @@ msgstr "Conferma"
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting
 msgid "My Awaiting Confirmation Holidays Requests"
-msgstr ""
+msgstr "Le Mie Richieste di Ferie in attesa di approvazione"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
 msgid "Employee_id"
-msgstr ""
+msgstr "ID Impiegato"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysdefinition0
 msgid "Encoding of annual available holidays."
-msgstr ""
+msgstr "Codificazione delle ferie annuali disponibili"
 
 #. module: hr_holidays
 #: field:hr.holidays,employee_id:0
 #: field:hr.holidays.log,employee_id:0
 #: field:hr.holidays.per.user,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Dipendente/Impiegato"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Validation"
-msgstr ""
+msgstr "In attesa di validazione"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
 msgid "Employee get holidays"
-msgstr ""
+msgstr "Il dipendente prende ferie"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Salmon"
-msgstr ""
+msgstr "Salmone Chiaro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr ""
+msgstr "Beige"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,nb_holidays:0
 msgid "Number of Holidays Requested"
-msgstr ""
+msgstr "Quantità di ferie richieste"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
 msgid "My Holiday Requests"
-msgstr ""
+msgstr "Le mie richieste di ferie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Numero Giorni"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,name:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Holiday Status"
-msgstr ""
+msgstr "Stato delle Ferie"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,init:0
 #: wizard_view:hr.holidays.summary.employee,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Report Opzioni"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
@@ -315,74 +315,75 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_approved0
 msgid "His manager approves the request"
-msgstr ""
+msgstr "Il suo manager approva la richiesta"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
 msgid "If holidays available, employee can take it and fill it."
 msgstr ""
+"Se le ferie sono disponibili, il dipendente può selezionarle e attribuirsele"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "You have to select at least 1 Employee. Try again."
-msgstr ""
+msgstr "Devi selezionare almeno un dipendente. Prova di nuovo."
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
 msgid "My Validated Holidays Requests"
-msgstr ""
+msgstr "Le Mie Richieste di Ferie convalidate"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary.employee,init,emp:0
 msgid "Employee(s)"
-msgstr ""
+msgstr "Dipendente/i"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days:0
 msgid "Number of Days in this Holiday Request"
-msgstr ""
+msgstr "Numero Giorni in questa Richiesta di Ferie"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
 #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
 msgid "Holidays Per Employee"
-msgstr ""
+msgstr "Ferie per Impiegato"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to override Limit"
-msgstr ""
+msgstr "Permettere di superare il limite"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_user_id:0
 msgid "Holidays user"
-msgstr ""
+msgstr "Ferie dell'utente"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Lavender"
-msgstr ""
+msgstr "Lavanda"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_log
 msgid "hr.holidays.log"
-msgstr ""
+msgstr "hr.holidays.log"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
 msgid "Print Summary of Employee's Holidays"
-msgstr ""
+msgstr "Stampa Riepilogativa Ferie per Dipendente"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_calendar0
 msgid "Calendar"
-msgstr ""
+msgstr "Calendario"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Vacation start day"
-msgstr ""
+msgstr "Primo giorno di Ferie"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -420,164 +421,197 @@ msgid ""
 "                Administration / Users / Users\n"
 "            for example, you maybe will do it for the user 'admin'.\n"
 msgstr ""
+"Risorse Umane: Tracciamento delle ferie e Workflo\n"
+"\n"
+"    Questo modulo ti permette di gestire le ferie e le richieste di ferie. "
+"Per ogni impiegati, puoi inoltre definire un numero di ferie disponibili per "
+"stato ferie.\n"
+"\n"
+"    Da notere che:\n"
+"    - Una sincronizzazione col un diario interno (ad uso del modulo di CRM) "
+"è possibille: nell'idea di creare automaticamente i Casi quando una "
+"richiesta di Ferie è accettate, puoi collegare lo stato delle ferie alla "
+"Sezione dei Casi. Puoi impostare questa informazione e una tua preferenza di "
+"colore nella sezione \n"
+"                    HR / Configrazione / Stato Ferie\n"
+"    - Un impiegato può fare una richiesta di ferie in negativo (esempio: "
+"richiesta di -2 giorni di ferie), questo è considerato dal sistema come una "
+"richiesta di più giorni di assenza. Questo increamenta il suo totale di "
+"stato di ferie disponibile (se la richiesta è accettata).\n"
+"    - Ci sono due modi per stmapre le ferie per impiegato:\n"
+"        * Il primo ti permette di scegliere l'impiegato per dipartimento ed "
+"è utilizzato cliccando la voce di menu localizzata in:\n"
+"                         HR / Richieste di ferie / Stampa un riepilogo delle "
+"ferie\n"
+"        * La seconda ti permette di scegliere il Report di Ferie per "
+"specifici impiegati. Vai nella lista:\n"
+"                         HR / Impiegati / Impiegati\n"
+"               seleziona poi quello che vuoi scegliere, clicca sull'icona di "
+"stampa e seleziona l'opzione \n"
+"                         'Stampa Riepilogo per le ferie dell'Impigato\n"
+"    - La procedura guidata permette di scegliere se vuoi stamare entrambe le "
+"ferie: Confermate & Validate oppure le sole Validate. Questi stati devono "
+"essere impostati da un utente dal menù:\n"
+"                         Administration / Users / Users\n"
+"                per esempio, tu puoi farlo per l'utente 'admin'.\n"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "Notification"
-msgstr ""
+msgstr "Notifica"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysrequest0
 msgid "Employee fills in a request for holidays"
-msgstr ""
+msgstr "Il dipendente riempe una richiesta per le ferie"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_setholiday0
 msgid "Holiday is set in the calendar."
-msgstr ""
+msgstr "Le Ferie sono impostate nel calendario."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Coral"
-msgstr ""
+msgstr "Corallo chiaro"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available
 msgid "My Available Holidays"
-msgstr ""
+msgstr "Le Mie Ferie Disponibili"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr ""
+msgstr "Nero"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
 msgid "My Refused Holidays Requests"
-msgstr ""
+msgstr "Le Mie Richieste di Ferie Rifiutate"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_setholiday0
 msgid "Set Holiday"
-msgstr ""
+msgstr "Definisci le Ferie"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
 msgid "My Draft Holidays Requests"
-msgstr ""
+msgstr "Le mie bozze di richiesta ferie"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,max_leaves:0
 msgid "Maximum Leaves Allowed"
-msgstr ""
+msgstr "Numero Massimo di permessi"
 
 #. module: hr_holidays
 #: field:hr.holidays,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stato"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Ivory"
-msgstr ""
+msgstr "Avorio"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
 msgid "My Holidays Request"
-msgstr ""
+msgstr "Le Mie Richieste di Ferie"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color of the status"
-msgstr ""
+msgstr "Colore dello Stato"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 msgid "Both Validated and Confirmed"
-msgstr ""
+msgstr "Entrambe validate e confermate"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr ""
+msgstr "Permessi già fruiti"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "holidays."
-msgstr ""
+msgstr "ferie."
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "draft"
-msgstr ""
+msgstr "Bozza"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utente"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
 msgid "Document for employee"
-msgstr ""
+msgstr "Documento per il dipendente"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
 msgid "Reufse"
-msgstr ""
+msgstr "Rifiuta"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Sezione"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "Holiday manager"
-msgstr ""
+msgstr "Responsabile Ferie"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,active:0
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr ""
+msgstr "Attivo"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
 msgid "My Holidays Request Draft"
-msgstr ""
+msgstr "Le mie bozze di richiesta Ferie"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
 msgid "Approved Request"
-msgstr ""
+msgstr "Richiesta approvata"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysrequest0
 msgid "Holidays Request"
-msgstr ""
+msgstr "Richiesta ferie"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
 msgid "Holidays Requests Awaiting for Validation"
-msgstr ""
+msgstr "Richieste di Ferie in attesa di convalida"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "Generale"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "General Information"
-msgstr ""
+msgstr "Informazione Generale"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -585,23 +619,23 @@ msgstr ""
 #: wizard_button:hr.holidays.summary,init,end:0
 #: wizard_button:hr.holidays.summary.employee,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
 msgid "Holidays def Request"
-msgstr ""
+msgstr "Definizione Richiesta di Ferie"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Validated"
-msgstr ""
+msgstr "Convalidata"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
 msgid "My Holidays Request Refused"
-msgstr ""
+msgstr "Le Mie Richieste di Ferie Rifiutate"
 
 #. module: hr_holidays
 #: constraint:ir.model:0
@@ -615,23 +649,23 @@ msgstr ""
 #: wizard_button:hr.holidays.summary,init,checkdept:0
 #: wizard_button:hr.holidays.summary.employee,init,checkemp:0
 msgid "Print"
-msgstr ""
+msgstr "Stampa"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.holidays_summary
 #: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
 msgid "Print Summary of Holidays"
-msgstr ""
+msgstr "Stampa Riepilogo delle Ferie"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,depts:0
 msgid "Department(s)"
-msgstr ""
+msgstr "Dipartimento/i"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -642,85 +676,85 @@ msgstr "Rifiutato"
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
 msgid "Request is approved."
-msgstr ""
+msgstr "Richiesta approvata"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
 msgid "Holidays Definition"
-msgstr ""
+msgstr "Definizione Ferie"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,holiday_type:0
 #: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "Seleziona Tipo Ferie"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 msgid "Case"
-msgstr ""
+msgstr "Caso"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
 msgid "Holiday per user"
-msgstr ""
+msgstr "Ferie per Utente"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidays0
 msgid "Encode number of available holidays"
-msgstr ""
+msgstr "Codificazione del numero di Ferie disponibili"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_legaldeclaration0
 msgid "Secretariat Social"
-msgstr ""
+msgstr "Segretariato sociale"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr ""
+msgstr "Violetto"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr ""
+msgstr "Rosso"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr ""
+msgstr "Risorse Umane: Gestione Ferie"
 
 #. module: hr_holidays
 #: model:process.process,name:hr_holidays.process_process_holidaysprocess0
 msgid "Holidays Process"
-msgstr ""
+msgstr "Processo di ferie"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
 msgid "You have to select at least 1 Department. Try again."
-msgstr ""
+msgstr "E' necessario selezionare almeno 1 Reparto. Riprova"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
 msgid "My Holidays Request Validated"
-msgstr ""
+msgstr "Le Mie Richieste di Ferie Convalidate"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_req_id:0
 msgid "Holiday Request ID"
-msgstr ""
+msgstr "ID Richiesta Ferie"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "Giallo Chiaro"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Pink"
-msgstr ""
+msgstr "Rosa Chiaro"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_refused0
 msgid "His manager refuses the request"
-msgstr ""
+msgstr "Il suo manager ha rifiutato la richiesta"
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 8fd15825786..93212addd62 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:13+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 96533e13b69..f8eff0bd67c 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index e425555b121..0469cf8fad2 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index 831ff2590dd..70f18dd32d7 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:15+0000\n"
+"PO-Revision-Date: 2010-08-18 13:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 719d15d20e3..642fbc40e89 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:24+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 8b134684832..8a9b0fdf162 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 12:44+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 57b57e69891..48943f0be71 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:36+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index d7124289854..a18e70f5df5 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:17+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:17+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index 362c73abf50..8257313d245 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:26+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index db7948ccb99..f4d7cdd97f2 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -7082,7 +7082,7 @@
             <field name="ref_base_code_id" ref="vat_code_a48"/>
             <field name="type_tax_use">sale</field>
         </record>
-        <record id="vat_IO_S" model="account.tax.template">
+        <record id="vat_IO_abc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
             <field name="name">TVA 0% ABC Intracommunautaire</field>
             <field name="description">V-INTRA-ABC 0</field>
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index 697ccc1e3dd..f0fd19a821c 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:32+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index 332d23fda0b..e82290b173c 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 11d31569b57..c748ad51b56 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:13+0000\n"
+"PO-Revision-Date: 2010-08-18 13:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index b78c8f71e23..3a30ea66ca3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:30+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/__openerp__.py b/addons/l10n_chart_uk_minimal/__openerp__.py
index 67258688f6b..f8df66de02b 100644
--- a/addons/l10n_chart_uk_minimal/__openerp__.py
+++ b/addons/l10n_chart_uk_minimal/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -57,7 +57,6 @@
 # - COGS account type fixed
 #
 
-
 {
     'name': 'United Kingdom - minimal',
     'version': '1.1',
@@ -65,16 +64,17 @@
     'description': """This is the base module to manage the accounting chart for United Kingdom in OpenERP.""",
     'author': 'Seath Solutions Ltd',
     'website': 'http://www.seathsolutions.com',
-    'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
+    'depends': ['base_iban', 'base_vat', 'account_chart'],
     'init_xml': [],
     'update_xml': [
-        'account_types.xml',
-        'account_chart.xml',
-        'account_tax.xml',
+        'l10n_uk_types.xml',
+        'l10n_uk_chart.xml',
+        'l10n_uk_tax.xml',
         'l10n_uk_wizard.xml'
     ],
     'demo_xml': [],
     'installable': True,
+    'active': False,
     'certificate': '0064392144797',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_chart_uk_minimal/i18n/it.po b/addons/l10n_chart_uk_minimal/i18n/it.po
index d4f9418d2b9..33101217121 100644
--- a/addons/l10n_chart_uk_minimal/i18n/it.po
+++ b/addons/l10n_chart_uk_minimal/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 17:51+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-08-18 10:16+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
@@ -27,11 +27,13 @@ msgid ""
 "This is the base module to manage the accounting chart for United Kingdom in "
 "Open ERP."
 msgstr ""
+"Questo è il modulo base per gestire il piano dei conti per il Regno Unito in "
+"Open ERP."
 
 #. module: l10n_chart_uk_minimal
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Errore! Non puoi creare un modello di conto ricorsivo"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_income
@@ -59,6 +61,14 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
+"Genera il Piano dei Conti da un Modello. Ti verrà richiesto di passare il "
+"nome della Compagnia, il modello da seguire, il numero di decimali per "
+"generare il codice dei tuoi conti e, per il conto della Banca, la valuta per "
+"creare il Libro Giornale. Così, una copia vergine del Piano dei Conti "
+"derivata dal modello è generata.\n"
+"\tQuesto è la stessa procedura automatica che viene lanciata da: Gestione "
+"Finanziaria / Configurazione / Contabilità / Conti finanziari / Genera il "
+"Piano dei conti da un modello."
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
@@ -68,7 +78,7 @@ msgstr "Debiti"
 #. module: l10n_chart_uk_minimal
 #: model:ir.module.module,shortdesc:l10n_chart_uk_minimal.module_meta_information
 msgid "United Kingdom - minimal"
-msgstr ""
+msgstr "Regno Unito - minimale"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_equity
@@ -78,7 +88,7 @@ msgstr "Capitale"
 #. module: l10n_chart_uk_minimal
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Errore! Non puoi creare un Codice di Tassa ricorsivo"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_expense
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index de0c6f4355f..e79c8dc41d6 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:16+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
index 6b89001e167..6b89001e167 100644
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
diff --git a/addons/l10n_chart_uk_minimal/account_tax.xml b/addons/l10n_chart_uk_minimal/l10n_uk_tax.xml
index 6f02fc22f5f..6f02fc22f5f 100644
--- a/addons/l10n_chart_uk_minimal/account_tax.xml
+++ b/addons/l10n_chart_uk_minimal/l10n_uk_tax.xml
diff --git a/addons/l10n_chart_uk_minimal/account_types.xml b/addons/l10n_chart_uk_minimal/l10n_uk_types.xml
index d9bfb5344ad..d9bfb5344ad 100644
--- a/addons/l10n_chart_uk_minimal/account_types.xml
+++ b/addons/l10n_chart_uk_minimal/l10n_uk_types.xml
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 42332628208..f96945a8bc8 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -40,6 +40,7 @@ Credits: Sistheo Zeekom CrysaLEAD
     "update_xml" : [
         "fr_report_demo.xml",
         "plan_comptable_general_demo.xml",
+        "l10n_fr_wizard.xml",
         "fr_pcg_taxes_demo.xml",
         "fr_tax_demo.xml",
         "fr_fiscal_templates_demo.xml",
@@ -47,6 +48,7 @@ Credits: Sistheo Zeekom CrysaLEAD
         "security/ir.model.access.csv",
         "wizard/fr_report_bilan_view.xml",
         "wizard/fr_report_compute_resultant_view.xml",
+        
     ],
     "demo_xml" : [],
     "certificate" : "00435321693876313629",
diff --git a/addons/l10n_fr/i18n/et.po b/addons/l10n_fr/i18n/et.po
index 8e4eee3abaf..8abb5e9b48b 100644
--- a/addons/l10n_fr/i18n/et.po
+++ b/addons/l10n_fr/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 21:06+0000\n"
+"PO-Revision-Date: 2010-08-17 09:54+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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index 50976981423..fb19010e27b 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py
index 08e8c9ed3e5..573f4f7519e 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/l10n_fr.py
@@ -29,9 +29,11 @@ class l10n_fr_report(osv.osv):
         'name': fields.char('Name', size=128),
         'line_ids': fields.one2many('l10n.fr.line', 'report_id', 'Lines'),
     }
+
     _sql_constraints = [
         ('code_uniq', 'unique (code)','The code report must be unique !')
     ]
+
 l10n_fr_report()
 
 class l10n_fr_line(osv.osv):
@@ -46,6 +48,7 @@ class l10n_fr_line(osv.osv):
     _sql_constraints = [
         ('code_uniq', 'unique (code)', 'The variable name must be unique !')
     ]
+
 l10n_fr_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
new file mode 100644
index 00000000000..985c3b81195
--- /dev/null
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <record id="config_call_account_template_fr" model="ir.actions.todo">
+        <field name="action_id" ref="account.action_wizard_multi_chart"/>
+        <field name="restart">onskip</field>
+    </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index e1c8eb943e5..f1b00896159 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -27,10 +27,11 @@
 ##############################################################################
 
 import time
+
 from report import report_sxw
 
 class base_report(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
+    def __init__(self, cr, uid, name, context=None):
         super(base_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
@@ -40,48 +41,46 @@ class base_report(report_sxw.rml_parse):
         })
         self.context = context
 
-    def _load(self,name,form):
-        fiscalyear=self.pool.get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear'])
-
-        period_query_cond=self.pool.get('account.period').search(self.cr, self.uid,[('fiscalyear_id','=',form['fiscalyear'])])
+    def _load(self, name, form):
+        fiscalyear = self.pool.get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear'])
+        period_query_cond=self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id', '=', form['fiscalyear'])])
 
-        self.cr.execute("SELECT MIN(date_start) AS date_start, MAX(date_stop) AS date_stop FROM account_period WHERE id IN %s",(tuple(period_query_cond),))
-        dates =self.cr.dictfetchall()
+        self.cr.execute("SELECT MIN(date_start) AS date_start, MAX(date_stop) AS date_stop FROM account_period WHERE id IN %s", (tuple(period_query_cond),))
+        dates = self.cr.dictfetchall()
         self._set_variable('date_start', dates[0]['date_start'])
         self._set_variable('date_stop', dates[0]['date_stop'])
 
         self.cr.execute("SELECT l10n_fr_line.code,definition FROM l10n_fr_line LEFT JOIN l10n_fr_report ON l10n_fr_report.id=report_id WHERE l10n_fr_report.code=%s",(name,))
-        datas =self.cr.dictfetchall()
+        datas = self.cr.dictfetchall()
         for line in datas:
             self._load_accounts(form,line['code'],eval(line['definition']),fiscalyear,period_query_cond)
 
-    def _set_variable(self,variable,valeur):
-        self.localcontext.update({variable:valeur})
+    def _set_variable(self, variable, valeur):
+        self.localcontext.update({variable: valeur})
 
-    def _get_variable(self,variable):
+    def _get_variable(self, variable):
         return self.localcontext[variable]
 
     def _load_accounts(self,form,code,definition,fiscalyear,period_query_cond):
-        accounts={}
+        accounts = {}
         for x in definition['load']:
-            p=x.split(":")
-            accounts[p[1]]=[p[0],p[2]]
-        sum=0.0
-
-        if fiscalyear.state!='done' or not code.startswith('bpcheck'):
-            query_cond="("
+            p = x.split(":")
+            accounts[p[1]] = [p[0],p[2]]
+        sum = 0.0
+        if fiscalyear.state != 'done' or not code.startswith('bpcheck'):
+            query_cond = "("
             for account in accounts:
-                query_cond += "aa.code LIKE '"+account+"%' OR "
+                query_cond += "aa.code LIKE '" + account + "%' OR "
             query_cond = query_cond[:-4]+")"
 
-            if len(definition['except'])>0:
+            if len(definition['except']) > 0:
                 query_cond = query_cond+" and ("
                 for account in definition['except']:
                     query_cond += "aa.code NOT LIKE '"+account+"%' AND "
                 query_cond = query_cond[:-5]+")"
 
-            closed_cond=""
-            if fiscalyear.state=='done':
+            closed_cond = ""
+            if fiscalyear.state == 'done':
                 closed_cond=" AND (aml.move_id NOT IN (SELECT account_move.id as move_id FROM account_move WHERE period_id IN "+str(tuple(period_query_cond))+" AND journal_id=(SELECT res_id FROM ir_model_data WHERE name='closing_journal' AND module='l10n_fr')) OR (aa.type != 'income' AND aa.type !='expense'))"
 
             query = "SELECT aa.code AS code, SUM(debit) as debit, SUM(credit) as credit FROM account_move_line aml LEFT JOIN account_account aa ON aa.id=aml.account_id WHERE "+query_cond+closed_cond+" AND aml.state='valid' AND aml.period_id IN "+str(tuple(period_query_cond))+" GROUP BY code"
@@ -94,19 +93,19 @@ class base_report(report_sxw.rml_parse):
                         operator=accounts[account][0]
                         type=accounts[account][1]
                         value=0.0
-                        if(type=="S"):
+                        if(type == "S"):
                             value=line["debit"]-line["credit"]
-                        elif(type=="D"):
+                        elif(type == "D"):
                             value=line["debit"]-line["credit"]
                             if(value<0.001): value=0.0
-                        elif(type=="C"):
+                        elif(type == "C"):
                             value=line["credit"]-line["debit"]
                             if(value<0.001): value=0.0
-                        if(operator=='+'):
-                            sum+=value
+                        if(operator == '+'):
+                            sum += value
                         else:
-                            sum-=value
+                            sum -= value
                         break
         self._set_variable(code, sum)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_fr/report/bilan_report.rml b/addons/l10n_fr/report/bilan_report.rml
index a462f61404e..e93a63aec86 100644
--- a/addons/l10n_fr/report/bilan_report.rml
+++ b/addons/l10n_fr/report/bilan_report.rml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="20.0" width="481" height="802"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Table3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P31" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P32" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P33" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P34" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P35" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P36" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P37" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P38" fontName="Times-Bold" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P39" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P40" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/><paraStyle name="P41" fontName="Times-Roman"/><paraStyle name="P42" fontName="Times-Roman" fontSize="13.0" leading="16"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/><paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/></stylesheet><images/><story><para style="P31">[[ _load('bilan',data['form'])]]</para><para style="P31">[[ _set_variable('at1a',bavar1+bavar2+bavar3+bavar4+bavar5+bavar6+bavar7+bavar8+bavar9+bavar10+bavar11+bavar12+bavar13+bavar14+bavar15+bavar16+bavar17+bavar18+bavar19+bavar20)]]</para><para style="P31">[[ _set_variable('at1b', bavar2b+bavar3b+bavar4b+bavar5b+bavar6b+bavar7b+bavar9b+bavar10b+bavar11b+bavar12b+bavar13b+bavar15b+ bavar16b+bavar17b+bavar18b+bavar19b+bavar20b)]]</para><para style="P31">[[ _set_variable('at1', at1a+at1b)]]</para><para style="P31">[[ _set_variable('at2a', bavar21+bavar22+bavar23+bavar24+bavar25+bavar26+bavar27+bavar28+bavar29+bavar30+bavar31+bavar32+bavar33)]]</para><para style="P31">[[ _set_variable('at2b', bavar21b+bavar22b+bavar23b+bavar24b+bavar26b+bavar27b+bavar29b+bavar30b)]]</para><para style="P31">[[ _set_variable('at2', at2a+at2b)]]</para><para style="P31">[[ _set_variable('actif', at1+at2+bavar34+bavar35+bavar36)]]</para><para style="P31">[[ _set_variable('pt1', bpvar1+bpvar2+bpvar3+bpvar4+bpvar5+bpvar6+bpvar7+bpvar8+bpvar9+bpvar10+bpvar11+bpvar12)]]</para><para style="P31">[[ _set_variable('pt2', bpvar13+bpvar14)]]</para><para style="P31">[[ _set_variable('pt3', bpvar15+bpvar16+bpvar17+bpvar18+bpvar19+bpvar20+bpvar21+bpvar22+bpvar23+bpvar24+bpvar25)]]</para><para style="P31">[[ _set_variable('passif', pt1+pt2+pt3+bpvar26)]]</para><blockTable colWidths="178.0,124.0,179.0" style="Tableau"><tr><td><para style="P40">[[ company.name ]]</para><para style="P39">au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para></td><td><para style="P35">Bilan</para></td><td><para style="P36">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para></td></tr><tr><td><para style="P33"><font color="white"> </font></para></td><td><para style="P31"><font color="white"> </font></para></td><td><para style="P34">Tenue de Compte : [[ company.currency_id.name ]]</para></td></tr></blockTable><para style="P38">ACTIF</para><blockTable colWidths="200.0,99.0,100.0,83.0" style="Table3"><tr><td><para style="P8"><font color="white"> </font></para></td><td><para style="P9">Brut</para></td><td><para style="P9">Amortissements et d&#xE9;pr&#xE9;ciations</para></td><td><para style="P9">Net</para></td></tr><tr><td><para style="P16"><font face="Times-Roman" size="6.0"/><font face="Times-Roman" size="7.0">C</font><font face="Times-Roman" size="7.0">apital souscrit - non appel&#xE9;</font></para></td><td><para style="P12">[[bavar1]]</para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P32">[[bavar1]]</para></td></tr><tr><td><para style="P17">ACTIF IMMOBILIS&#xC9;</para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P11">IMMOBILISATIONS INCORPORELLES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Frais d'&#xE9;tablissement</para></td><td><para style="P12">[[bavar2]]</para></td><td><para style="P12">[[-bavar2b]]</para></td><td><para style="P32">[[bavar2+bavar2b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Frais de recherche et de d&#xE9;veloppement</para></td><td><para style="P12">[[bavar3]]</para></td><td><para style="P12">[[-bavar3b]]</para></td><td><para style="P32">[[bavar3+bavar3b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Concessions, brevets, licences,..., droits et valeurs similaires</para></td><td><para style="P12">[[bavar4]]</para></td><td><para style="P12">[[-bavar4b]]</para></td><td><para style="P32">[[bavar4+bavar4b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Fonds commercial</para></td><td><para style="P12">[[bavar5]]</para></td><td><para style="P12">[[-bavar5b]]</para></td><td><para style="P32">[[bavar5+bavar5b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Autres</para></td><td><para style="P12">[[bavar6]]</para></td><td><para style="P12">[[-bavar6b]]</para></td><td><para style="P32">[[bavar6+bavar6b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Immobilisations incorporelles en cours</para></td><td><para style="P12">[[bavar7]]</para></td><td><para style="P12">[[-bavar7b]]</para></td><td><para style="P32">[[bavar7+bavar7b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Avances et acomptes</para></td><td><para style="P12">[[bavar8]]</para></td><td><para style="P15"><font color="white"> </font></para></td><td><para style="P32">[[bavar8]]</para></td></tr><tr><td><para style="P11">IMMOBILISATIONS CORPORELLES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">T</font>errains</para></td><td><para style="P12">[[bavar9]]</para></td><td><para style="P12">[[-bavar9b]]</para></td><td><para style="P32">[[bavar9+bavar9b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">C</font>onstructions</para></td><td><para style="P12">[[bavar10]]</para></td><td><para style="P12">[[-bavar10b]]</para></td><td><para style="P32">[[bavar10+bavar10b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">I</font>nstallations techniques,mat&#xE9;riel et outillage</para></td><td><para style="P12">[[bavar11]]</para></td><td><para style="P12">[[-bavar11b]]</para></td><td><para style="P32">[[bavar11+bavar11b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres </para></td><td><para style="P12">[[bavar12]]</para></td><td><para style="P12">[[-bavar12b]]</para></td><td><para style="P32">[[bavar12+bavar12b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">I</font>mmobilisations corporelles en cours</para></td><td><para style="P12">[[bavar13]]</para></td><td><para style="P12">[[-bavar13b]]</para></td><td><para style="P32">[[bavar13+bavar13b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>vances et acomptes</para></td><td><para style="P12">[[bavar14]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar14]]</para></td></tr><tr><td><para style="P11">IMMOBILISATIONS FINANCI&#xC9;RES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>articipations</para></td><td><para style="P12">[[bavar15]]</para></td><td><para style="P12">[[-bavar15b]]</para></td><td><para style="P32">[[bavar15+bavar15b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">C</font>r&#xE9;ances rattach&#xE9;es &#xE0; des participations</para></td><td><para style="P12">[[bavar16]]</para></td><td><para style="P12">[[-bavar16b]]</para></td><td><para style="P32">[[bavar16+bavar16b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">T</font>itres immobilis&#xE9;s de l'activit&#xE9; de portefeuille</para></td><td><para style="P12">[[bavar17]]</para></td><td><para style="P12">[[-bavar17b]]</para></td><td><para style="P32">[[bavar17+bavar17b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres titres immobilis&#xE9;s</para></td><td><para style="P12">[[bavar18]]</para></td><td><para style="P12">[[-bavar18b]]</para></td><td><para style="P32">[[bavar18+bavar18b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>r&#xEA;ts</para></td><td><para style="P12">[[bavar19]]</para></td><td><para style="P12">[[-bavar19b]]</para></td><td><para style="P32">[[bavar19+bavar19b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres</para></td><td><para style="P12">[[bavar20]]</para></td><td><para style="P12">[[-bavar20b]]</para></td><td><para style="P32">[[bavar20+bavar20b]]</para></td></tr><tr><td><para style="P10">TOTAL I</para></td><td><para style="P5">[[at1a]]</para></td><td><para style="P5">[[-at1b]]</para></td><td><para style="P32">[[at1]]</para></td></tr><tr><td><para style="P6">ACTIF CIRCULANT</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P11">STOCK EN COURS</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">M</font>ati&#xE8;res premi&#xE8;res et autres approvisionnements</para></td><td><para style="P12">[[bavar21]]</para></td><td><para style="P12">[[-bavar21b]]</para></td><td><para style="P32">[[bavar21+bavar21b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">E</font>n-cours de production [biens et services]</para></td><td><para style="P12">[[bavar22]]</para></td><td><para style="P12">[[-bavar22b]]</para></td><td><para style="P32">[[bavar22+bavar22b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>roduits interm&#xE9;diaires et finis</para></td><td><para style="P12">[[bavar23]]</para></td><td><para style="P12">[[-bavar23b]]</para></td><td><para style="P32">[[bavar23+bavar23b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">M</font>archandises</para></td><td><para style="P12">[[bavar24]]</para></td><td><para style="P12">[[-bavar24b]]</para></td><td><para style="P32">[[bavar24+bavar24b]]</para></td></tr><tr><td><para style="P13">Avances et acomptes vers&#xE9;s sur commandes</para></td><td><para style="P12">[[bavar25]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar25]]</para></td></tr><tr><td><para style="P11">CR&#xC9;ANCES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Cr&#xE9;ances clients et comptes rattach&#xE9;s</para></td><td><para style="P12">[[bavar26]]</para></td><td><para style="P12">[[-bavar26b]]</para></td><td><para style="P32">[[bavar26+bavar26b]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Autres</para></td><td><para style="P12">[[bavar27]]</para></td><td><para style="P12">[[-bavar27b]]</para></td><td><para style="P32">[[bavar27+bavar27b]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Capital souscrit - appel&#xE9; , non vers&#xE9;</para></td><td><para style="P12">[[bavar28]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar28]]</para></td></tr><tr><td><para style="P18">VALEURS MOBILI&#xC8;RES DE PLACEMENT</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P19">Actions propres</para></td><td><para style="P12">[[bavar29]]</para></td><td><para style="P12">[[-bavar29b]]</para></td><td><para style="P32">[[bavar29+bavar29b]]</para></td></tr><tr><td><para style="P19">Autres titres</para></td><td><para style="P12">[[bavar30]]</para></td><td><para style="P12">[[-bavar30b]]</para></td><td><para style="P32">[[bavar30+bavar30b]]</para></td></tr><tr><td><para style="P19">Instruments de tr&#xE9;sorerie</para></td><td><para style="P12">[[bavar31]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar31]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman">D</font>isponibilit&#xE9;s</para></td><td><para style="P12">[[bavar32]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar32]]</para></td></tr><tr><td><para style="P19">Charges constat&#xE9;s d'avance</para></td><td><para style="P12">[[bavar33]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar33]]</para></td></tr><tr><td><para style="P10">TOTAL II</para></td><td><para style="P5">[[at2a]]</para></td><td><para style="P5">[[-at2b]]</para></td><td><para style="P32">[[at2]]</para></td></tr><tr><td><para style="P12">Charges &#xE0; r&#xE9;partir sur plusieurs exercices <font face="Times-Roman">( III )</font></para></td><td><para style="P12">[[bavar34]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar34]]</para></td></tr><tr><td><para style="P12">Primes de remboursement des emprunts <font face="Times-Roman">( IV )</font></para></td><td><para style="P12">[[bavar35]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar35]]</para></td></tr><tr><td><para style="P12">&#xC9;carts de conversion actif <font face="Times-Roman">( V )</font></para></td><td><para style="P12">[[bavar36]]</para></td><td><para style="P2"><font color="white"> </font></para></td><td><para style="P32">[[bavar36]]</para></td></tr><tr><td><para style="P7"><font face="Times-Roman" size="7.0">TOTAL ACTIF ( </font><font face="Times-Bold" size="7.0">I + II + III + IV + V</font><font face="Times-Roman" size="7.0"> )</font></para></td><td><para style="P5">[[at1a+at2a]]</para></td><td><para style="P5">[[-at1b-at2b]]</para></td><td><para style="P32">[[actif]]</para></td></tr></blockTable><para style="P37">PASSIF</para><blockTable colWidths="211.0,270.0" style="Tableau3"><tr><td><para style="P4">CAPITAUX PROPRES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P28">Capital [dont vers&#xE9;...]</para></td><td><para style="P3">[[bpvar1]]</para></td></tr><tr><td><para style="P28">Primes d'&#xE9;mission, de fusion, d'apport</para></td><td><para style="P3">[[bpvar2]]</para></td></tr><tr><td><para style="P22">&#xC9;carts de r&#xE9;&#xE9;valuation</para></td><td><para style="P3">[[bpvar3]]</para></td></tr><tr><td><para style="P22">&#xC9;cart d'&#xE9;quivalence</para></td><td><para style="P3">[[bpvar4]]</para></td></tr><tr><td><para style="P26">R&#xC9;SERVES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P22">R&#xE9;serve l&#xE9;gale</para></td><td><para style="P3">[[bpvar5]]</para></td></tr><tr><td><para style="P22">R&#xE9;serves statutaires ou contractuelles</para></td><td><para style="P3">[[bpvar6]]</para></td></tr><tr><td><para style="P22">R&#xE9;serves r&#xE9;glement&#xE9;es</para></td><td><para style="P3">[[bpvar7]]</para></td></tr><tr><td><para style="P28">Autres r&#xE9;serves</para></td><td><para style="P3">[[bpvar8]]</para></td></tr><tr><td><para style="P28">Report &#xE0; nouveau</para></td><td><para style="P3">[[bpvar9]]</para></td></tr><tr><td><para style="P25">R&#xC9;SULTAT DE L'EXERCICE [b&#xE9;n&#xE9;fice ou perte]</para></td><td><para style="P3">[[bpvar10]]</para></td></tr><tr><td><para style="P23">Subventions d'investissement</para></td><td><para style="P3">[[bpvar11]]</para></td></tr><tr><td><para style="P23">Provisions r&#xE9;glement&#xE9;es</para></td><td><para style="P3">[[bpvar12]]</para></td></tr><tr><td><para style="P27">TOTAL I</para></td><td><para style="P3">[[pt1]]</para></td></tr><tr><td><para style="P29">PROVISIONS</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P22">Provisions pour risques</para></td><td><para style="P3">[[bpvar13]]</para></td></tr><tr><td><para style="P22">Provisions pour charges</para></td><td><para style="P3">[[bpvar14]]</para></td></tr><tr><td><para style="P27">TOTAL II</para></td><td><para style="P3">[[pt2]]</para></td></tr><tr><td><para style="P30">DETTES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P21">Emprunts obligataires convertibles</para></td><td><para style="P3">[[bpvar15]]</para></td></tr><tr><td><para style="P21">Autres emprunts obligataires</para></td><td><para style="P3">[[bpvar16]]</para></td></tr><tr><td><para style="P21">Emprunts et dettes aupr&#xE8;s des &#xE9;tablissements de cr&#xE9;dit</para></td><td><para style="P3">[[bpvar17]]</para></td></tr><tr><td><para style="P21">Emprunts et dettes financi&#xE8;res diverses</para></td><td><para style="P3">[[bpvar18]]</para></td></tr><tr><td><para style="P21">Avances et acomptes re&#xE7;us sur commandes en cours</para></td><td><para style="P3">[[bpvar19]]</para></td></tr><tr><td><para style="P21">Dettes fournisseurs et comptes rattach&#xE9;s </para></td><td><para style="P3">[[bpvar20]]</para></td></tr><tr><td><para style="P21">Dettes fiscales et sociales</para></td><td><para style="P3">[[bpvar21]]</para></td></tr><tr><td><para style="P21">Dettes sur immobilisations et comptes rattach&#xE9;s</para></td><td><para style="P3">[[bpvar22]]</para></td></tr><tr><td><para style="P21">Autres dettes</para></td><td><para style="P3">[[bpvar23]]</para></td></tr><tr><td><para style="P21">Instruments de tr&#xE9;sorerie</para></td><td><para style="P3">[[bpvar24]]</para></td></tr><tr><td><para style="P21">Produits constat&#xE9;s d'avance</para></td><td><para style="P3">[[bpvar25]]</para></td></tr><tr><td><para style="P20">TOTAL III</para></td><td><para style="P3">[[pt3]]</para></td></tr><tr><td><para style="P24">&#xC9;carts de conversion passif <font face="Times-Roman">( IV )</font></para></td><td><para style="P3">[[bpvar26]]</para></td></tr><tr><td><para style="P27">TOTAL G&#xC9;N&#xC9;RAL (I + II + III + IV)</para></td><td><para style="P3">[[passif]]</para></td></tr><tr><td><para style="P27">ACTIF - PASSIF</para></td><td><para style="P3">[[round(actif-passif,2)]]</para></td></tr></blockTable><para style="P41"><font color="white"> </font></para><para style="P42"><font face="Times-Roman" size="13.0">[[ abs(bpcheck)&lt;0.0001 and removeParentNode('para') ]] Attention, pour que votre bilan soit correct, vous devez solder les comptes 120 ou 129 (R&#xE9;sultat de l'exercice pr&#xE9;c&#xE9;dant) dans un compte de report &#xE0; nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez </font>vous sur votre structure juridique et son fonctionnement comptable.</para></story></document>
+<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Bilan" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="20.0" width="481" height="802"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Table3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P31" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P32" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P33" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P34" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P35" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P36" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P37" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P38" fontName="Times-Bold" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P39" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P40" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/><paraStyle name="P41" fontName="Times-Roman"/><paraStyle name="P42" fontName="Times-Roman" fontSize="13.0" leading="16"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/><paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/></stylesheet><images/><story><para style="P31">[[ _load('bilan',data['form'])]]</para><para style="P31">[[ _set_variable('at1a',bavar1+bavar2+bavar3+bavar4+bavar5+bavar6+bavar7+bavar8+bavar9+bavar10+bavar11+bavar12+bavar13+bavar14+bavar15+bavar16+bavar17+bavar18+bavar19+bavar20)]]</para><para style="P31">[[ _set_variable('at1b', bavar2b+bavar3b+bavar4b+bavar5b+bavar6b+bavar7b+bavar9b+bavar10b+bavar11b+bavar12b+bavar13b+bavar15b+ bavar16b+bavar17b+bavar18b+bavar19b+bavar20b)]]</para><para style="P31">[[ _set_variable('at1', at1a+at1b)]]</para><para style="P31">[[ _set_variable('at2a', bavar21+bavar22+bavar23+bavar24+bavar25+bavar26+bavar27+bavar28+bavar29+bavar30+bavar31+bavar32+bavar33)]]</para><para style="P31">[[ _set_variable('at2b', bavar21b+bavar22b+bavar23b+bavar24b+bavar26b+bavar27b+bavar29b+bavar30b)]]</para><para style="P31">[[ _set_variable('at2', at2a+at2b)]]</para><para style="P31">[[ _set_variable('actif', at1+at2+bavar34+bavar35+bavar36)]]</para><para style="P31">[[ _set_variable('pt1', bpvar1+bpvar2+bpvar3+bpvar4+bpvar5+bpvar6+bpvar7+bpvar8+bpvar9+bpvar10+bpvar11+bpvar12)]]</para><para style="P31">[[ _set_variable('pt2', bpvar13+bpvar14)]]</para><para style="P31">[[ _set_variable('pt3', bpvar15+bpvar16+bpvar17+bpvar18+bpvar19+bpvar20+bpvar21+bpvar22+bpvar23+bpvar24+bpvar25)]]</para><para style="P31">[[ _set_variable('passif', pt1+pt2+pt3+bpvar26)]]</para><blockTable colWidths="178.0,124.0,179.0" style="Tableau"><tr><td><para style="P40">[[ company.name ]]</para><para style="P39">au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para></td><td><para style="P35">Bilan</para></td><td><para style="P36">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para></td></tr><tr><td><para style="P33"><font color="white"> </font></para></td><td><para style="P31"><font color="white"> </font></para></td><td><para style="P34">Tenue de Compte : [[ company.currency_id.name ]]</para></td></tr></blockTable><para style="P38">ACTIF</para><blockTable colWidths="200.0,99.0,100.0,83.0" style="Table3"><tr><td><para style="P8"><font color="white"> </font></para></td><td><para style="P9">Brut</para></td><td><para style="P9">Amortissements et d&#xE9;pr&#xE9;ciations</para></td><td><para style="P9">Net</para></td></tr><tr><td><para style="P16"><font face="Times-Roman" size="6.0"/><font face="Times-Roman" size="7.0">C</font><font face="Times-Roman" size="7.0">apital souscrit - non appel&#xE9;</font></para></td><td><para style="P12">[[bavar1]]</para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P32">[[bavar1]]</para></td></tr><tr><td><para style="P17">ACTIF IMMOBILIS&#xC9;</para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P12"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P11">IMMOBILISATIONS INCORPORELLES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Frais d'&#xE9;tablissement</para></td><td><para style="P12">[[bavar2]]</para></td><td><para style="P12">[[-bavar2b]]</para></td><td><para style="P32">[[bavar2+bavar2b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Frais de recherche et de d&#xE9;veloppement</para></td><td><para style="P12">[[bavar3]]</para></td><td><para style="P12">[[-bavar3b]]</para></td><td><para style="P32">[[bavar3+bavar3b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Concessions, brevets, licences,..., droits et valeurs similaires</para></td><td><para style="P12">[[bavar4]]</para></td><td><para style="P12">[[-bavar4b]]</para></td><td><para style="P32">[[bavar4+bavar4b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Fonds commercial</para></td><td><para style="P12">[[bavar5]]</para></td><td><para style="P12">[[-bavar5b]]</para></td><td><para style="P32">[[bavar5+bavar5b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Autres</para></td><td><para style="P12">[[bavar6]]</para></td><td><para style="P12">[[-bavar6b]]</para></td><td><para style="P32">[[bavar6+bavar6b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Immobilisations incorporelles en cours</para></td><td><para style="P12">[[bavar7]]</para></td><td><para style="P12">[[-bavar7b]]</para></td><td><para style="P32">[[bavar7+bavar7b]]</para></td></tr><tr><td><para style="P14"><font face="Times-Roman"/>Avances et acomptes</para></td><td><para style="P12">[[bavar8]]</para></td><td><para style="P15"><font color="white"> </font></para></td><td><para style="P32">[[bavar8]]</para></td></tr><tr><td><para style="P11">IMMOBILISATIONS CORPORELLES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">T</font>errains</para></td><td><para style="P12">[[bavar9]]</para></td><td><para style="P12">[[-bavar9b]]</para></td><td><para style="P32">[[bavar9+bavar9b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">C</font>onstructions</para></td><td><para style="P12">[[bavar10]]</para></td><td><para style="P12">[[-bavar10b]]</para></td><td><para style="P32">[[bavar10+bavar10b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">I</font>nstallations techniques,mat&#xE9;riel et outillage</para></td><td><para style="P12">[[bavar11]]</para></td><td><para style="P12">[[-bavar11b]]</para></td><td><para style="P32">[[bavar11+bavar11b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres </para></td><td><para style="P12">[[bavar12]]</para></td><td><para style="P12">[[-bavar12b]]</para></td><td><para style="P32">[[bavar12+bavar12b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">I</font>mmobilisations corporelles en cours</para></td><td><para style="P12">[[bavar13]]</para></td><td><para style="P12">[[-bavar13b]]</para></td><td><para style="P32">[[bavar13+bavar13b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>vances et acomptes</para></td><td><para style="P12">[[bavar14]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar14]]</para></td></tr><tr><td><para style="P11">IMMOBILISATIONS FINANCI&#xC9;RES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>articipations</para></td><td><para style="P12">[[bavar15]]</para></td><td><para style="P12">[[-bavar15b]]</para></td><td><para style="P32">[[bavar15+bavar15b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">C</font>r&#xE9;ances rattach&#xE9;es &#xE0; des participations</para></td><td><para style="P12">[[bavar16]]</para></td><td><para style="P12">[[-bavar16b]]</para></td><td><para style="P32">[[bavar16+bavar16b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">T</font>itres immobilis&#xE9;s de l'activit&#xE9; de portefeuille</para></td><td><para style="P12">[[bavar17]]</para></td><td><para style="P12">[[-bavar17b]]</para></td><td><para style="P32">[[bavar17+bavar17b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres titres immobilis&#xE9;s</para></td><td><para style="P12">[[bavar18]]</para></td><td><para style="P12">[[-bavar18b]]</para></td><td><para style="P32">[[bavar18+bavar18b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>r&#xEA;ts</para></td><td><para style="P12">[[bavar19]]</para></td><td><para style="P12">[[-bavar19b]]</para></td><td><para style="P32">[[bavar19+bavar19b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">A</font>utres</para></td><td><para style="P12">[[bavar20]]</para></td><td><para style="P12">[[-bavar20b]]</para></td><td><para style="P32">[[bavar20+bavar20b]]</para></td></tr><tr><td><para style="P10">TOTAL I</para></td><td><para style="P5">[[at1a]]</para></td><td><para style="P5">[[-at1b]]</para></td><td><para style="P32">[[at1]]</para></td></tr><tr><td><para style="P6">ACTIF CIRCULANT</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P11">STOCK EN COURS</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P13"><font face="Times-Roman">M</font>ati&#xE8;res premi&#xE8;res et autres approvisionnements</para></td><td><para style="P12">[[bavar21]]</para></td><td><para style="P12">[[-bavar21b]]</para></td><td><para style="P32">[[bavar21+bavar21b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">E</font>n-cours de production [biens et services]</para></td><td><para style="P12">[[bavar22]]</para></td><td><para style="P12">[[-bavar22b]]</para></td><td><para style="P32">[[bavar22+bavar22b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">P</font>roduits interm&#xE9;diaires et finis</para></td><td><para style="P12">[[bavar23]]</para></td><td><para style="P12">[[-bavar23b]]</para></td><td><para style="P32">[[bavar23+bavar23b]]</para></td></tr><tr><td><para style="P13"><font face="Times-Roman">M</font>archandises</para></td><td><para style="P12">[[bavar24]]</para></td><td><para style="P12">[[-bavar24b]]</para></td><td><para style="P32">[[bavar24+bavar24b]]</para></td></tr><tr><td><para style="P13">Avances et acomptes vers&#xE9;s sur commandes</para></td><td><para style="P12">[[bavar25]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar25]]</para></td></tr><tr><td><para style="P11">CR&#xC9;ANCES</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Cr&#xE9;ances clients et comptes rattach&#xE9;s</para></td><td><para style="P12">[[bavar26]]</para></td><td><para style="P12">[[-bavar26b]]</para></td><td><para style="P32">[[bavar26+bavar26b]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Autres</para></td><td><para style="P12">[[bavar27]]</para></td><td><para style="P12">[[-bavar27b]]</para></td><td><para style="P32">[[bavar27+bavar27b]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman"/>Capital souscrit - appel&#xE9; , non vers&#xE9;</para></td><td><para style="P12">[[bavar28]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar28]]</para></td></tr><tr><td><para style="P18">VALEURS MOBILI&#xC8;RES DE PLACEMENT</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32"><font color="white"> </font></para></td></tr><tr><td><para style="P19">Actions propres</para></td><td><para style="P12">[[bavar29]]</para></td><td><para style="P12">[[-bavar29b]]</para></td><td><para style="P32">[[bavar29+bavar29b]]</para></td></tr><tr><td><para style="P19">Autres titres</para></td><td><para style="P12">[[bavar30]]</para></td><td><para style="P12">[[-bavar30b]]</para></td><td><para style="P32">[[bavar30+bavar30b]]</para></td></tr><tr><td><para style="P19">Instruments de tr&#xE9;sorerie</para></td><td><para style="P12">[[bavar31]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar31]]</para></td></tr><tr><td><para style="P19"><font face="Times-Roman">D</font>isponibilit&#xE9;s</para></td><td><para style="P12">[[bavar32]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar32]]</para></td></tr><tr><td><para style="P19">Charges constat&#xE9;s d'avance</para></td><td><para style="P12">[[bavar33]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar33]]</para></td></tr><tr><td><para style="P10">TOTAL II</para></td><td><para style="P5">[[at2a]]</para></td><td><para style="P5">[[-at2b]]</para></td><td><para style="P32">[[at2]]</para></td></tr><tr><td><para style="P12">Charges &#xE0; r&#xE9;partir sur plusieurs exercices <font face="Times-Roman">( III )</font></para></td><td><para style="P12">[[bavar34]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar34]]</para></td></tr><tr><td><para style="P12">Primes de remboursement des emprunts <font face="Times-Roman">( IV )</font></para></td><td><para style="P12">[[bavar35]]</para></td><td><para style="P5"><font color="white"> </font></para></td><td><para style="P32">[[bavar35]]</para></td></tr><tr><td><para style="P12">&#xC9;carts de conversion actif <font face="Times-Roman">( V )</font></para></td><td><para style="P12">[[bavar36]]</para></td><td><para style="P2"><font color="white"> </font></para></td><td><para style="P32">[[bavar36]]</para></td></tr><tr><td><para style="P7"><font face="Times-Roman" size="7.0">TOTAL ACTIF ( </font><font face="Times-Bold" size="7.0">I + II + III + IV + V</font><font face="Times-Roman" size="7.0"> )</font></para></td><td><para style="P5">[[at1a+at2a]]</para></td><td><para style="P5">[[-at1b-at2b]]</para></td><td><para style="P32">[[actif]]</para></td></tr></blockTable><para style="P37">PASSIF</para><blockTable colWidths="211.0,270.0" style="Tableau3"><tr><td><para style="P4">CAPITAUX PROPRES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P28">Capital [dont vers&#xE9;...]</para></td><td><para style="P3">[[bpvar1]]</para></td></tr><tr><td><para style="P28">Primes d'&#xE9;mission, de fusion, d'apport</para></td><td><para style="P3">[[bpvar2]]</para></td></tr><tr><td><para style="P22">&#xC9;carts de r&#xE9;&#xE9;valuation</para></td><td><para style="P3">[[bpvar3]]</para></td></tr><tr><td><para style="P22">&#xC9;cart d'&#xE9;quivalence</para></td><td><para style="P3">[[bpvar4]]</para></td></tr><tr><td><para style="P26">R&#xC9;SERVES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P22">R&#xE9;serve l&#xE9;gale</para></td><td><para style="P3">[[bpvar5]]</para></td></tr><tr><td><para style="P22">R&#xE9;serves statutaires ou contractuelles</para></td><td><para style="P3">[[bpvar6]]</para></td></tr><tr><td><para style="P22">R&#xE9;serves r&#xE9;glement&#xE9;es</para></td><td><para style="P3">[[bpvar7]]</para></td></tr><tr><td><para style="P28">Autres r&#xE9;serves</para></td><td><para style="P3">[[bpvar8]]</para></td></tr><tr><td><para style="P28">Report &#xE0; nouveau</para></td><td><para style="P3">[[bpvar9]]</para></td></tr><tr><td><para style="P25">R&#xC9;SULTAT DE L'EXERCICE [b&#xE9;n&#xE9;fice ou perte]</para></td><td><para style="P3">[[bpvar10]]</para></td></tr><tr><td><para style="P23">Subventions d'investissement</para></td><td><para style="P3">[[bpvar11]]</para></td></tr><tr><td><para style="P23">Provisions r&#xE9;glement&#xE9;es</para></td><td><para style="P3">[[bpvar12]]</para></td></tr><tr><td><para style="P27">TOTAL I</para></td><td><para style="P3">[[pt1]]</para></td></tr><tr><td><para style="P29">PROVISIONS</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P22">Provisions pour risques</para></td><td><para style="P3">[[bpvar13]]</para></td></tr><tr><td><para style="P22">Provisions pour charges</para></td><td><para style="P3">[[bpvar14]]</para></td></tr><tr><td><para style="P27">TOTAL II</para></td><td><para style="P3">[[pt2]]</para></td></tr><tr><td><para style="P30">DETTES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P21">Emprunts obligataires convertibles</para></td><td><para style="P3">[[bpvar15]]</para></td></tr><tr><td><para style="P21">Autres emprunts obligataires</para></td><td><para style="P3">[[bpvar16]]</para></td></tr><tr><td><para style="P21">Emprunts et dettes aupr&#xE8;s des &#xE9;tablissements de cr&#xE9;dit</para></td><td><para style="P3">[[bpvar17]]</para></td></tr><tr><td><para style="P21">Emprunts et dettes financi&#xE8;res diverses</para></td><td><para style="P3">[[bpvar18]]</para></td></tr><tr><td><para style="P21">Avances et acomptes re&#xE7;us sur commandes en cours</para></td><td><para style="P3">[[bpvar19]]</para></td></tr><tr><td><para style="P21">Dettes fournisseurs et comptes rattach&#xE9;s </para></td><td><para style="P3">[[bpvar20]]</para></td></tr><tr><td><para style="P21">Dettes fiscales et sociales</para></td><td><para style="P3">[[bpvar21]]</para></td></tr><tr><td><para style="P21">Dettes sur immobilisations et comptes rattach&#xE9;s</para></td><td><para style="P3">[[bpvar22]]</para></td></tr><tr><td><para style="P21">Autres dettes</para></td><td><para style="P3">[[bpvar23]]</para></td></tr><tr><td><para style="P21">Instruments de tr&#xE9;sorerie</para></td><td><para style="P3">[[bpvar24]]</para></td></tr><tr><td><para style="P21">Produits constat&#xE9;s d'avance</para></td><td><para style="P3">[[bpvar25]]</para></td></tr><tr><td><para style="P20">TOTAL III</para></td><td><para style="P3">[[pt3]]</para></td></tr><tr><td><para style="P24">&#xC9;carts de conversion passif <font face="Times-Roman">( IV )</font></para></td><td><para style="P3">[[bpvar26]]</para></td></tr><tr><td><para style="P27">TOTAL G&#xC9;N&#xC9;RAL (I + II + III + IV)</para></td><td><para style="P3">[[passif]]</para></td></tr><tr><td><para style="P27">ACTIF - PASSIF</para></td><td><para style="P3">[[round(actif-passif,2)]]</para></td></tr></blockTable><para style="P41"><font color="white"> </font></para><para style="P42"><font face="Times-Roman" size="13.0">[[ abs(bpcheck)&lt;0.0001 and removeParentNode('para') ]] Attention, pour que votre bilan soit correct, vous devez solder les comptes 120 ou 129 (R&#xE9;sultat de l'exercice pr&#xE9;c&#xE9;dant) dans un compte de report &#xE0; nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez </font>vous sur votre structure juridique et son fonctionnement comptable.</para></story></document>
 
diff --git a/addons/l10n_fr/report/compute_resultant_report.rml b/addons/l10n_fr/report/compute_resultant_report.rml
index 7ac220a62be..9d3693f0b52 100644
--- a/addons/l10n_fr/report/compute_resultant_report.rml
+++ b/addons/l10n_fr/report/compute_resultant_report.rml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="20.0" width="481" height="802"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><blockTableStyle id="Tableau1"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P19" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P22" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P23" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P24" fontName="Times-Roman"/><paraStyle name="P25" fontName="Times-Roman"/><paraStyle name="P26" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P27" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P28" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/><paraStyle name="P29" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/><paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/></stylesheet><images/><story><para style="P19">[[ _load('cdr',data['form'])]]</para><para style="P19">[[ _set_variable('ct1', cdrc1+cdrc2+cdrc3+cdrc4+cdrc5+cdrc6+cdrc7+cdrc8+cdrc9+cdrc10+cdrc11+cdrc12+cdrc13+cdrc14+cdrc15)]]</para><para style="P19">[[ _set_variable('ct3', cdrc17+cdrc18+cdrc19+cdrc20)]]</para><para style="P19">[[ _set_variable('ct4', cdrc21+cdrc22+cdrc23)]]</para><para style="P19">[[ _set_variable('charges', ct1+cdrc16+ct3+ct4+cdrc24+cdrc25)]]</para><para style="P19">[[ _set_variable('pta', cdrp1+cdrp2)]]</para><para style="P19">[[ _set_variable('ptb', cdrp3+cdrp4+cdrp5+cdrp6+cdrp7)]]</para><para style="P19">[[ _set_variable('pt1', pta+ptb)]]</para><para style="P19">[[ _set_variable('pt3', cdrp9+cdrp10+cdrp11+cdrp12+cdrp13+cdrp14)]]</para><para style="P19">[[ _set_variable('pt4', cdrp15+cdrp16+cdrp17)]]</para><para style="P19">[[ _set_variable('produits', pt1+cdrp8+pt3+pt4)]]</para><blockTable colWidths="165.0,160.0,156.0" style="Tableau"><tr><td><para style="P28">[[ company.name ]]</para><para style="P26">p&#xE9;riode du [[ time.strftime('%d-%m-%Y',time.strptime(date_start,'%Y-%m-%d'))]] au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para></td><td><para style="P22">Compte de r&#xE9;sultat</para></td><td><para style="P23">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para></td></tr><tr><td><para style="P20"><font color="white"> </font></para></td><td><para style="P19"><font color="white"> </font></para></td><td><para style="P21">Tenue de Compte : [[ company.currency_id.name ]]</para></td></tr></blockTable><para style="P27"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau3"><tr><td><para style="P3">CHARGES ( hors taxes )</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">CHARGES D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Achat de marchandises</para></td><td><para style="P2">[[cdrc1]]</para></td></tr><tr><td><para style="P10">Variation des stocks</para></td><td><para style="P2">[[cdrc2]]</para></td></tr><tr><td><para style="P10">Achats de mati&#xE8;res premi&#xE8;res et autres approvisionnements</para></td><td><para style="P2">[[cdrc3]]</para></td></tr><tr><td><para style="P17">Variation des stocks</para></td><td><para style="P2">[[cdrc4]]</para></td></tr><tr><td><para style="P10">Autres achats et charges externes</para></td><td><para style="P2">[[cdrc5]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail mobilier</para></td><td><para style="P2">[[cdrc6]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail immobilier</para></td><td><para style="P2">[[cdrc7]]</para></td></tr><tr><td><para style="P10">Imp&#xF4;ts, taxes et versements assimil&#xE9;s</para></td><td><para style="P2">[[cdrc8]]</para></td></tr><tr><td><para style="P10">Salaires et traitements</para></td><td><para style="P2">[[cdrc9]]</para></td></tr><tr><td><para style="P17">Charges sociales</para></td><td><para style="P2">[[cdrc10]]</para></td></tr><tr><td><para style="P17">Dotation aux amortissements et aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux amortissements</para></td><td><para style="P2">[[cdrc11]]</para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc12]]</para></td></tr><tr><td><para style="P12">Sur actif circulant : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc13]]</para></td></tr><tr><td><para style="P12">Dotations aux provisions</para></td><td><para style="P2">[[cdrc14]]</para></td></tr><tr><td><para style="P12">Autres charges</para></td><td><para style="P2">[[cdrc15]]</para></td></tr><tr><td><para style="P16">TOTAL I</para></td><td><para style="P2">[[ct1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun ( II )</para></td><td><para style="P2">[[cdrc16]]</para></td></tr><tr><td><para style="P15">CHARGES FINANCI&#xC8;RES</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P10">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc17]]</para></td></tr><tr><td><para style="P10">Int&#xE9;r&#xEA;ts et charges assimil&#xE9;es</para></td><td><para style="P2">[[cdrc18]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences n&#xE9;gatives de change</para></td><td><para style="P2">[[cdrc19]]</para></td></tr><tr><td><para style="P10">Charges nettes sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrc20]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[ct3]]</para></td></tr><tr><td><para style="P18">CHARGES EXCEPTIONNELLES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrc21]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrc22]]</para></td></tr><tr><td><para style="P6">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc23]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[ct4]]</para></td></tr><tr><td><para style="P8">Participation des salari&#xE9;s aux r&#xE9;sultats <font face="Times-Roman" size="7.0">( V )</font></para></td><td><para style="P2">[[cdrc24]]</para></td></tr><tr><td><para style="P9">Imp&#xF4;ts sur les b&#xE9;n&#xE9;fices <font face="Times-Roman" size="7.0">( VI )</font></para></td><td><para style="P2">[[cdrc25]]</para></td></tr><tr><td><para style="P16">TOTAL CHARGES ( I + II + III <font face="Times-Bold" size="7.0">+ IV+ V+ VI</font> )</para></td><td><para style="P2">[[charges]]</para></td></tr></blockTable><para style="P24"><font color="white"> </font></para><pageBreak/><para style="P25"><font color="white"> </font></para><para style="P24"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau1"><tr><td><para style="P3">PRODUITS (hors taxes)</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">PRODUITS D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Vente de marchandises</para></td><td><para style="P2">[[cdrp1]]</para></td></tr><tr><td><para style="P10">Production vendue [biens et services]</para></td><td><para style="P2">[[cdrp2]]</para></td></tr><tr><td><para style="P13">Sous-total A - Montant net du chiffre d'affaires</para></td><td><para style="P2">[[pta]]</para></td></tr><tr><td><para style="P17">Production stock&#xE9;e</para></td><td><para style="P2">[[cdrp3]]</para></td></tr><tr><td><para style="P10">Production immobilis&#xE9;e</para></td><td><para style="P2">[[cdrp4]]</para></td></tr><tr><td><para style="P10">Subventions d'exploitation</para></td><td><para style="P2">[[cdrp5]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations (et amortissements) et transferts de charges</para></td><td><para style="P2">[[cdrp6]]</para></td></tr><tr><td><para style="P10">Autres produits</para></td><td><para style="P2">[[cdrp7]]</para></td></tr><tr><td><para style="P13">Sous-total B</para></td><td><para style="P2">[[ptb]]</para></td></tr><tr><td><para style="P14">TOTAL I ( A + B )</para></td><td><para style="P2">[[pt1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun (II)</para></td><td><para style="P2">[[cdrp8]]</para></td></tr><tr><td><para style="P15">PRODUITS FINANCIERS</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P11">De participation</para></td><td><para style="P2">[[cdrp9]]</para></td></tr><tr><td><para style="P11">D'autres valeurs mobili&#xE8;res et cr&#xE9;ances de l'actif immobilis&#xE9;</para></td><td><para style="P2">[[cdrp10]]</para></td></tr><tr><td><para style="P10">Autres int&#xE9;r&#xEA;ts et produits assimil&#xE9;s</para></td><td><para style="P2">[[cdrp11]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp12]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences positives de change</para></td><td><para style="P2">[[cdrp13]]</para></td></tr><tr><td><para style="P10">Produits nets sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrp14]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[pt3]]</para></td></tr><tr><td><para style="P18">PRODUITS EXCEPTIONNELS</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrp15]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrp16]]</para></td></tr><tr><td><para style="P6">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp17]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[pt4]]</para></td></tr><tr><td><para style="P16">TOTAL DES PRODUITS ( I + II + III + IV )</para></td><td><para style="P2">[[produits]]</para></td></tr><tr><td><para style="P16">PRODUITS - CHARGES</para></td><td><para style="P2">[[produits-charges]]</para></td></tr></blockTable><para style="Standard"><font color="white"> </font></para></story></document>
+<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Compte de resultat" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="20.0" width="481" height="802"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau"><blockAlignment value="LEFT"/><blockValign value="TOP"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="0,1" stop="0,1"/><blockBackground colorName="#e6e6e6" start="1,1" stop="1,1"/><blockBackground colorName="#e6e6e6" start="2,1" stop="2,1"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><blockTableStyle id="Tableau1"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P19" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P20" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P21" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P22" fontName="Times-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P23" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="P24" fontName="Times-Roman"/><paraStyle name="P25" fontName="Times-Roman"/><paraStyle name="P26" fontName="Times-Roman" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="P27" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="1.0" spaceAfter="1.0"/><paraStyle name="P28" fontName="Times-Bold" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="3.0"/><paraStyle name="P29" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="0.0"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/><paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/></stylesheet><images/><story><para style="P19">[[ _load('cdr',data['form'])]]</para><para style="P19">[[ _set_variable('ct1', cdrc1+cdrc2+cdrc3+cdrc4+cdrc5+cdrc6+cdrc7+cdrc8+cdrc9+cdrc10+cdrc11+cdrc12+cdrc13+cdrc14+cdrc15)]]</para><para style="P19">[[ _set_variable('ct3', cdrc17+cdrc18+cdrc19+cdrc20)]]</para><para style="P19">[[ _set_variable('ct4', cdrc21+cdrc22+cdrc23)]]</para><para style="P19">[[ _set_variable('charges', ct1+cdrc16+ct3+ct4+cdrc24+cdrc25)]]</para><para style="P19">[[ _set_variable('pta', cdrp1+cdrp2)]]</para><para style="P19">[[ _set_variable('ptb', cdrp3+cdrp4+cdrp5+cdrp6+cdrp7)]]</para><para style="P19">[[ _set_variable('pt1', pta+ptb)]]</para><para style="P19">[[ _set_variable('pt3', cdrp9+cdrp10+cdrp11+cdrp12+cdrp13+cdrp14)]]</para><para style="P19">[[ _set_variable('pt4', cdrp15+cdrp16+cdrp17)]]</para><para style="P19">[[ _set_variable('produits', pt1+cdrp8+pt3+pt4)]]</para><blockTable colWidths="165.0,160.0,156.0" style="Tableau"><tr><td><para style="P28">[[ company.name ]]</para><para style="P26">p&#xE9;riode du [[ time.strftime('%d-%m-%Y',time.strptime(date_start,'%Y-%m-%d'))]] au [[ time.strftime('%d-%m-%Y',time.strptime(date_stop,'%Y-%m-%d'))]]</para></td><td><para style="P22">Compte de r&#xE9;sultat</para></td><td><para style="P23">Imprim&#xE9; le : [[ time.strftime('%d-%m-%Y') ]]</para></td></tr><tr><td><para style="P20"><font color="white"> </font></para></td><td><para style="P19"><font color="white"> </font></para></td><td><para style="P21">Tenue de Compte : [[ company.currency_id.name ]]</para></td></tr></blockTable><para style="P27"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau3"><tr><td><para style="P3">CHARGES ( hors taxes )</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">CHARGES D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Achat de marchandises</para></td><td><para style="P2">[[cdrc1]]</para></td></tr><tr><td><para style="P10">Variation des stocks</para></td><td><para style="P2">[[cdrc2]]</para></td></tr><tr><td><para style="P10">Achats de mati&#xE8;res premi&#xE8;res et autres approvisionnements</para></td><td><para style="P2">[[cdrc3]]</para></td></tr><tr><td><para style="P17">Variation des stocks</para></td><td><para style="P2">[[cdrc4]]</para></td></tr><tr><td><para style="P10">Autres achats et charges externes</para></td><td><para style="P2">[[cdrc5]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail mobilier</para></td><td><para style="P2">[[cdrc6]]</para></td></tr><tr><td><para style="P10">Redevances de cr&#xE9;dit-bail immobilier</para></td><td><para style="P2">[[cdrc7]]</para></td></tr><tr><td><para style="P10">Imp&#xF4;ts, taxes et versements assimil&#xE9;s</para></td><td><para style="P2">[[cdrc8]]</para></td></tr><tr><td><para style="P10">Salaires et traitements</para></td><td><para style="P2">[[cdrc9]]</para></td></tr><tr><td><para style="P17">Charges sociales</para></td><td><para style="P2">[[cdrc10]]</para></td></tr><tr><td><para style="P17">Dotation aux amortissements et aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux amortissements</para></td><td><para style="P2">[[cdrc11]]</para></td></tr><tr><td><para style="P12">Sur immobilisations : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc12]]</para></td></tr><tr><td><para style="P12">Sur actif circulant : dotations aux d&#xE9;pr&#xE9;ciations</para></td><td><para style="P2">[[cdrc13]]</para></td></tr><tr><td><para style="P12">Dotations aux provisions</para></td><td><para style="P2">[[cdrc14]]</para></td></tr><tr><td><para style="P12">Autres charges</para></td><td><para style="P2">[[cdrc15]]</para></td></tr><tr><td><para style="P16">TOTAL I</para></td><td><para style="P2">[[ct1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun ( II )</para></td><td><para style="P2">[[cdrc16]]</para></td></tr><tr><td><para style="P15">CHARGES FINANCI&#xC8;RES</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P10">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc17]]</para></td></tr><tr><td><para style="P10">Int&#xE9;r&#xEA;ts et charges assimil&#xE9;es</para></td><td><para style="P2">[[cdrc18]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences n&#xE9;gatives de change</para></td><td><para style="P2">[[cdrc19]]</para></td></tr><tr><td><para style="P10">Charges nettes sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrc20]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[ct3]]</para></td></tr><tr><td><para style="P18">CHARGES EXCEPTIONNELLES</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrc21]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrc22]]</para></td></tr><tr><td><para style="P6">Dotations aux amortissements, aux d&#xE9;pr&#xE9;ciations et aux provisions</para></td><td><para style="P2">[[cdrc23]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[ct4]]</para></td></tr><tr><td><para style="P8">Participation des salari&#xE9;s aux r&#xE9;sultats <font face="Times-Roman" size="7.0">( V )</font></para></td><td><para style="P2">[[cdrc24]]</para></td></tr><tr><td><para style="P9">Imp&#xF4;ts sur les b&#xE9;n&#xE9;fices <font face="Times-Roman" size="7.0">( VI )</font></para></td><td><para style="P2">[[cdrc25]]</para></td></tr><tr><td><para style="P16">TOTAL CHARGES ( I + II + III <font face="Times-Bold" size="7.0">+ IV+ V+ VI</font> )</para></td><td><para style="P2">[[charges]]</para></td></tr></blockTable><para style="P24"><font color="white"> </font></para><pageBreak/><para style="P25"><font color="white"> </font></para><para style="P24"><font color="white"> </font></para><blockTable colWidths="309.0,173.0" style="Tableau1"><tr><td><para style="P3">PRODUITS (hors taxes)</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P4">PRODUITS D'EXPLOITATION</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P17">Vente de marchandises</para></td><td><para style="P2">[[cdrp1]]</para></td></tr><tr><td><para style="P10">Production vendue [biens et services]</para></td><td><para style="P2">[[cdrp2]]</para></td></tr><tr><td><para style="P13">Sous-total A - Montant net du chiffre d'affaires</para></td><td><para style="P2">[[pta]]</para></td></tr><tr><td><para style="P17">Production stock&#xE9;e</para></td><td><para style="P2">[[cdrp3]]</para></td></tr><tr><td><para style="P10">Production immobilis&#xE9;e</para></td><td><para style="P2">[[cdrp4]]</para></td></tr><tr><td><para style="P10">Subventions d'exploitation</para></td><td><para style="P2">[[cdrp5]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations (et amortissements) et transferts de charges</para></td><td><para style="P2">[[cdrp6]]</para></td></tr><tr><td><para style="P10">Autres produits</para></td><td><para style="P2">[[cdrp7]]</para></td></tr><tr><td><para style="P13">Sous-total B</para></td><td><para style="P2">[[ptb]]</para></td></tr><tr><td><para style="P14">TOTAL I ( A + B )</para></td><td><para style="P2">[[pt1]]</para></td></tr><tr><td><para style="P5">Quotes-parts de r&#xE9;sultat sur op&#xE9;rations faites en commun (II)</para></td><td><para style="P2">[[cdrp8]]</para></td></tr><tr><td><para style="P15">PRODUITS FINANCIERS</para></td><td><para style="P2"><font color="white"> </font></para></td></tr><tr><td><para style="P11">De participation</para></td><td><para style="P2">[[cdrp9]]</para></td></tr><tr><td><para style="P11">D'autres valeurs mobili&#xE8;res et cr&#xE9;ances de l'actif immobilis&#xE9;</para></td><td><para style="P2">[[cdrp10]]</para></td></tr><tr><td><para style="P10">Autres int&#xE9;r&#xEA;ts et produits assimil&#xE9;s</para></td><td><para style="P2">[[cdrp11]]</para></td></tr><tr><td><para style="P10">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp12]]</para></td></tr><tr><td><para style="P10">Diff&#xE9;rences positives de change</para></td><td><para style="P2">[[cdrp13]]</para></td></tr><tr><td><para style="P10">Produits nets sur cessions de valeurs mobili&#xE8;res de placement</para></td><td><para style="P2">[[cdrp14]]</para></td></tr><tr><td><para style="P16">TOTAL III</para></td><td><para style="P2">[[pt3]]</para></td></tr><tr><td><para style="P18">PRODUITS EXCEPTIONNELS</para></td><td><para style="P1"><font color="white"> </font></para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations de gestion</para></td><td><para style="P2">[[cdrp15]]</para></td></tr><tr><td><para style="P6">Sur op&#xE9;rations en capital</para></td><td><para style="P2">[[cdrp16]]</para></td></tr><tr><td><para style="P6">Reprises sur provisions, d&#xE9;pr&#xE9;ciations et transferts de charges</para></td><td><para style="P2">[[cdrp17]]</para></td></tr><tr><td><para style="P7">TOTAL IV</para></td><td><para style="P2">[[pt4]]</para></td></tr><tr><td><para style="P16">TOTAL DES PRODUITS ( I + II + III + IV )</para></td><td><para style="P2">[[produits]]</para></td></tr><tr><td><para style="P16">PRODUITS - CHARGES</para></td><td><para style="P2">[[produits-charges]]</para></td></tr></blockTable><para style="Standard"><font color="white"> </font></para></story></document>
 
diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index 9f9e4a933f1..cec2e513a6a 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -32,24 +32,25 @@ class account_bilan_report(osv.osv_memory):
     _name = 'account.bilan.report'
     _description = 'Account Bilan Report'
 
-    def _get_default_fiscalyear(self, cr, uid, context):
+    def _get_default_fiscalyear(self, cr, uid, context=None):
         fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid)
         return fiscalyear_id
 
     _columns = {
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True),
-        }
+    }
+
     _defaults = {
         'fiscalyear_id':_get_default_fiscalyear
-        }
+    }
 
     def print_bilan_report(self, cr, uid, ids, context=None):
-        active_ids = context.get('active_ids',[])
+        active_ids = context.get('active_ids', [])
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
         data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
-        return {'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.bilan', 'datas': data }
+        return {'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.bilan', 'datas': data}
 
 account_bilan_report()
 
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index d70894122d4..e8615935b8c 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <openerp>
     <data>
+
         <record id="bilan_report_view" model="ir.ui.view">
             <field name="name">Bilan Report</field>
             <field name="model">account.bilan.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form>
+            	<form string="Bilan Report">
 	               <field name="fiscalyear_id"/>
 	               <separator colspan="4"/>
                     <group colspan="4" col="6">
@@ -36,5 +38,6 @@
             <field name="key">action</field>
             <field name="model">account.move.line</field>
         </record>
+
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index 24211b46cb7..d90466ea6c4 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -31,21 +31,21 @@ from osv import osv, fields
 class account_cdr_report(osv.osv_memory):
     _name = 'account.cdr.report'
     _description = 'Account CDR Report'
-    
-    def _get_defaults(self, cr, uid, context):
-        fiscalyear_obj = self.pool.get('account.fiscalyear')
-        fiscalyear_id = fiscalyear_obj.find(cr, uid)
+
+    def _get_defaults(self, cr, uid, context=None):
+        fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid)
         return fiscalyear_id
-    
+
     _columns = {
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True),
-        }
+    }
+
     _defaults = {
-              'fiscalyear_id': _get_defaults
-        }
+        'fiscalyear_id': _get_defaults
+    }
 
     def print_cdr_report(self, cr, uid, ids, context=None):
-        active_ids = context.get('active_ids',[])
+        active_ids = context.get('active_ids', [])
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
@@ -54,5 +54,4 @@ class account_cdr_report(osv.osv_memory):
 
 account_cdr_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index a81d1b1e3c7..f50ec1ef308 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="cdr_report_view" model="ir.ui.view">
             <field name="name">Compte de resultat Report</field>
             <field name="model">account.cdr.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form>
+            	<form string='Compte de resultant'>
 	               <field name="fiscalyear_id"/>
 	               <separator colspan="4"/>
                     <group colspan="4" col="6">
@@ -36,5 +37,6 @@
             <field name="key">action</field>
             <field name="model">account.move.line</field>
         </record>
+
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 18791f9e0f4..e6174c0fdca 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -20,24 +20,23 @@
 ##############################################################################
 
 {
-    "name" : "Indian Chart of Account",
-    "version" : "1.0",
-    "description":"""
+    "name": "Indian Chart of Account",
+    "version": "1.0",
+    "description": """
     Indian Accounting : chart of Account
     """,
-    "author" : 'OpenERP SA & Axelor',
+    "author": 'OpenERP SA & Axelor',
     "category": "Localisation/Account Charts",
-    "depends" : [
+    "depends": [
         "account",
         "account_chart"
     ],
-    "demo_xml" : [],
-    "update_xml" : [
-        "account_chart.xml",
-        "account_wizard.xml",
+    "demo_xml": [],
+    "update_xml": [
+        "l10n_in_chart.xml",
+        "l10n_in_wizard.xml",
     ],
     "active": False,
     "installable": True
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in/account_tax.xml b/addons/l10n_in/account_tax.xml
index 857e5977e0b..80f1233f498 100644
--- a/addons/l10n_in/account_tax.xml
+++ b/addons/l10n_in/account_tax.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <openerp>
 <data noupdate="1">
-<record id="tax1" model="account.tax">
-	<field name="name">PPn (10%)(10.0%)</field>
-	<field name="amount">0.100000</field>
-	<field name="type">percent</field>
-	<field name="account_collected_id" ref="chart2310"/>
-	<field name="account_paid_id" ref="chart2310"/>
-	<field name="base_code_id" ref="vat_code_base_due"/>
-	<field name="tax_code_id" ref="vat_code_due_tva"/>
-	<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
-	<field name="ref_tax_code_id" ref="vat_code_payable"/>
-</record>
+
+	<record id="tax1" model="account.tax">
+		<field name="name">PPn (10%)(10.0%)</field>
+		<field name="amount">0.100000</field>
+		<field name="type">percent</field>
+		<field name="account_collected_id" ref="chart2310"/>
+		<field name="account_paid_id" ref="chart2310"/>
+		<field name="base_code_id" ref="vat_code_base_due"/>
+		<field name="tax_code_id" ref="vat_code_due_tva"/>
+		<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
+		<field name="ref_tax_code_id" ref="vat_code_payable"/>
+	</record>
+
 </data>
 </openerp>
diff --git a/addons/l10n_in/account_tax_code.xml b/addons/l10n_in/account_tax_code.xml
index 2fba08e5f5a..bec870dd426 100644
--- a/addons/l10n_in/account_tax_code.xml
+++ b/addons/l10n_in/account_tax_code.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <openerp>
     <data noupdate="True">
 
diff --git a/addons/l10n_in/i18n/et.po b/addons/l10n_in/i18n/et.po
index 6acb5bdc6e1..898f31cf316 100644
--- a/addons/l10n_in/i18n/et.po
+++ b/addons/l10n_in/i18n/et.po
@@ -17,26 +17,26 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_chart_in
-#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+#. module: l10n_in
+#: model:ir.module.module,description:l10n_in.module_meta_information
 msgid ""
 "\n"
 "    Indian Accounting : chart of Account\n"
 "    "
 msgstr ""
 
-#. module: l10n_chart_in
+#. module: l10n_in
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
 msgstr "Viga ! Sa ei saa luua rekrusiivseid kontomalle."
 
-#. module: l10n_chart_in
-#: model:account.journal,name:l10n_chart_in.opening_journal
+#. module: l10n_in
+#: model:account.journal,name:l10n_in.opening_journal
 msgid "Opening Journal"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+#. module: l10n_in
+#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
 msgid ""
 "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
 "the name of the company, the chart template to follow, the no. of digits to "
@@ -54,42 +54,42 @@ msgstr ""
 "Finantsjuhtimine/Seadistus/Finantsraamatupidamine/Mallid/Tekita kontoplaan "
 "kasutades plaani malli."
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_liability1
 msgid "Liability"
 msgstr "Kohustus"
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_asset1
 msgid "Asset"
 msgstr "Vara"
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_closed1
 msgid "Closed"
 msgstr "Suletud"
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_income1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_income1
 msgid "Income"
 msgstr "Tulu"
 
-#. module: l10n_chart_in
+#. module: l10n_in
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
 msgstr "Viga ! sa ei saa luua rekrusiivseid maksukoode."
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_expense1
 msgid "Expense"
 msgstr "Kulu"
 
-#. module: l10n_chart_in
-#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+#. module: l10n_in
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
 msgid "Indian Chart of Account"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_root_ind1
 msgid "View"
 msgstr "Vaade"
diff --git a/addons/l10n_in/i18n/fr_BE.po b/addons/l10n_in/i18n/fr_BE.po
index 8e06c7b34d0..1d4fe34679b 100644
--- a/addons/l10n_in/i18n/fr_BE.po
+++ b/addons/l10n_in/i18n/fr_BE.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* l10n_chart_in
+#	* l10n_in
 #
 msgid ""
 msgstr ""
@@ -15,66 +15,66 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_chart_in
-#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+#. module: l10n_in
+#: model:ir.module.module,description:l10n_in.module_meta_information
 msgid "\n"
 "    Indian Accounting : chart of Account\n"
 "    "
 msgstr ""
 
-#. module: l10n_chart_in
+#. module: l10n_in
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.journal,name:l10n_chart_in.opening_journal
+#. module: l10n_in
+#: model:account.journal,name:l10n_in.opening_journal
 msgid "Opening Journal"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+#. module: l10n_in
+#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
 msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
 "	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_liability1
 msgid "Liability"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_asset1
 msgid "Asset"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_closed1
 msgid "Closed"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_income1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_income1
 msgid "Income"
 msgstr ""
 
-#. module: l10n_chart_in
+#. module: l10n_in
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_expense1
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+#. module: l10n_in
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
 msgid "Indian Chart of Account"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_root_ind1
 msgid "View"
 msgstr ""
 
diff --git a/addons/l10n_in/i18n/l10n_chart_in.pot b/addons/l10n_in/i18n/l10n_in.pot
index 8e06c7b34d0..1d4fe34679b 100644
--- a/addons/l10n_in/i18n/l10n_chart_in.pot
+++ b/addons/l10n_in/i18n/l10n_in.pot
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* l10n_chart_in
+#	* l10n_in
 #
 msgid ""
 msgstr ""
@@ -15,66 +15,66 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_chart_in
-#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+#. module: l10n_in
+#: model:ir.module.module,description:l10n_in.module_meta_information
 msgid "\n"
 "    Indian Accounting : chart of Account\n"
 "    "
 msgstr ""
 
-#. module: l10n_chart_in
+#. module: l10n_in
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.journal,name:l10n_chart_in.opening_journal
+#. module: l10n_in
+#: model:account.journal,name:l10n_in.opening_journal
 msgid "Opening Journal"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+#. module: l10n_in
+#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
 msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
 "	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_liability1
 msgid "Liability"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_asset1
 msgid "Asset"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_closed1
 msgid "Closed"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_income1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_income1
 msgid "Income"
 msgstr ""
 
-#. module: l10n_chart_in
+#. module: l10n_in
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_expense1
 msgid "Expense"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+#. module: l10n_in
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
 msgid "Indian Chart of Account"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_root_ind1
 msgid "View"
 msgstr ""
 
diff --git a/addons/l10n_in/i18n/ru.po b/addons/l10n_in/i18n/ru.po
index 1c32faf63f7..377291d74d3 100644
--- a/addons/l10n_in/i18n/ru.po
+++ b/addons/l10n_in/i18n/ru.po
@@ -17,26 +17,26 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_chart_in
-#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+#. module: l10n_in
+#: model:ir.module.module,description:l10n_in.module_meta_information
 msgid ""
 "\n"
 "    Indian Accounting : chart of Account\n"
 "    "
 msgstr ""
 
-#. module: l10n_chart_in
+#. module: l10n_in
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.journal,name:l10n_chart_in.opening_journal
+#. module: l10n_in
+#: model:account.journal,name:l10n_in.opening_journal
 msgid "Opening Journal"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+#. module: l10n_in
+#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
 msgid ""
 "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
 "the name of the company, the chart template to follow, the no. of digits to "
@@ -47,42 +47,42 @@ msgid ""
 "Chart of Accounts from a Chart Template."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_liability1
 msgid "Liability"
 msgstr "Обязательства"
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_asset1
 msgid "Asset"
 msgstr "Оборудование"
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_closed1
 msgid "Closed"
 msgstr "Закрытый"
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_income1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_income1
 msgid "Income"
 msgstr "Доход"
 
-#. module: l10n_chart_in
+#. module: l10n_in
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_expense1
 msgid "Expense"
 msgstr "Расход"
 
-#. module: l10n_chart_in
-#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+#. module: l10n_in
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
 msgid "Indian Chart of Account"
 msgstr ""
 
-#. module: l10n_chart_in
-#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_root_ind1
 msgid "View"
 msgstr "Просмотр"
diff --git a/addons/l10n_in/account_chart.xml b/addons/l10n_in/l10n_in_chart.xml
index 4aff02f9296..4aff02f9296 100644
--- a/addons/l10n_in/account_chart.xml
+++ b/addons/l10n_in/l10n_in_chart.xml
diff --git a/addons/l10n_in/account_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml
index 1b6d22c6044..1b6d22c6044 100644
--- a/addons/l10n_in/account_wizard.xml
+++ b/addons/l10n_in/l10n_in_wizard.xml
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 4e289026c95..739f36c9ce4 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -37,11 +37,13 @@ This module installs:
     'update_xml': [
         'account.tax.code.template.csv',
         'l10n_lu_data.xml',
+        'l10n_lu_wizard.xml',
         'account.tax.template.csv',
         'wizard/print_vat_view.xml'
     ],
     'demo_xml': ['account.report.report.csv'],
     'installable': True,
+    'active': False,
     'certificate': '0078164766621',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 0c28c05190f..356eaf412f6 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
+"PO-Revision-Date: 2010-08-18 13:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/l10n_lu_data.xml b/addons/l10n_lu/l10n_lu_data.xml
index fa7433d1397..940da2177e5 100644
--- a/addons/l10n_lu/l10n_lu_data.xml
+++ b/addons/l10n_lu/l10n_lu_data.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" ?>
+
 <openerp>
 	<data noupdate="1">
+
         <!--
-        Account Type
+        	Account Type
         -->
+
         <record id="account_type_root" model="account.account.type">
             <field name="name">View</field>
             <field name="code">view</field>
@@ -53,3724 +56,3724 @@
 
 
     <!-- Account Templates -->
-<record id="account_lu_0" model="account.account.template">
-  <field name="code">0</field>
-  <field name="name">Plan KLUWER</field>
-  <field name="type" >view</field>
-  <field name="user_type" ref="account_type_root"/>
-</record>
-
-<record id="account_1" model="account.account.template">
-  <field name="code">1</field>
-  <field name="name">Fonds propres, prov. &amp; dettes + d&apos;1an</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_lu_0"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_2" model="account.account.template">
-  <field name="code">2</field>
-  <field name="name">Immobilis., dettes &amp; créances à + d&apos;1 an</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_lu_0"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_3" model="account.account.template">
-  <field name="code">3</field>
-  <field name="name">Stocks et commandes en cours d&apos;exécution</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_lu_0"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_4" model="account.account.template">
-  <field name="code">4</field>
-  <field name="name">Créances et dettes à un an au plus</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_lu_0"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_5" model="account.account.template">
-  <field name="code">5</field>
-  <field name="name">Placements de trésorerie et disponible</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_lu_0"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_6" model="account.account.template">
-  <field name="code">6</field>
-  <field name="name">Charges</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_lu_0"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_7" model="account.account.template">
-  <field name="code">7</field>
-  <field name="name">Produits</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_lu_0"/>
-  <field name="type">view</field>
-</record>
-<record id="account_10" model="account.account.template">
-  <field name="code">10</field>
-  <field name="name">Capital</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_12" model="account.account.template">
-  <field name="code">12</field>
-  <field name="name">Plus-values de réévaluation</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_13" model="account.account.template">
-  <field name="code">13</field>
-  <field name="name">Réserves</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_14" model="account.account.template">
-  <field name="code">14</field>
-  <field name="name">Résultat reporté</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_15" model="account.account.template">
-  <field name="code">15</field>
-  <field name="name">Subsides en capital</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_16" model="account.account.template">
-  <field name="code">16</field>
-  <field name="name">Provisions et impôts différés</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_17" model="account.account.template">
-  <field name="code">17</field>
-  <field name="name">Dettes à plus d&apos;un an</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_20" model="account.account.template">
-  <field name="code">20</field>
-  <field name="name">Frais d&apos;établissement</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_21" model="account.account.template">
-  <field name="code">21</field>
-  <field name="name">Immobilisations incorporelles</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_22" model="account.account.template">
-  <field name="code">22</field>
-  <field name="name">Terrains et constructions</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_23" model="account.account.template">
-  <field name="code">23</field>
-  <field name="name">Installations, machines et outillages</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_24" model="account.account.template">
-  <field name="code">24</field>
-  <field name="name">Mobilier et matériel roulant</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_25" model="account.account.template">
-  <field name="code">25</field>
-  <field name="name">Immobilisation détenues en loc.-fin.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_27" model="account.account.template">
-  <field name="code">27</field>
-  <field name="name">Immobilis. corp. en cours &amp; acptes versé</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_28" model="account.account.template">
-  <field name="code">28</field>
-  <field name="name">Immobilisations financières</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_30" model="account.account.template">
-  <field name="code">30</field>
-  <field name="name">Approvisionnements - matières premières</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_3"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_31" model="account.account.template">
-  <field name="code">31</field>
-  <field name="name">Approvisionnements et fournitures</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_3"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_32" model="account.account.template">
-  <field name="code">32</field>
-  <field name="name">En cours de fabrication</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_3"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_33" model="account.account.template">
-  <field name="code">33</field>
-  <field name="name">Produits finis</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_3"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_34" model="account.account.template">
-  <field name="code">34</field>
-  <field name="name">Marchandises</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_3"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_36" model="account.account.template">
-  <field name="code">36</field>
-  <field name="name">Acomptes versés sur achats pour stocks</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_3"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_40" model="account.account.template">
-  <field name="code">40</field>
-  <field name="name">Créances commerciales</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_41" model="account.account.template">
-  <field name="code">41</field>
-  <field name="name">Autres créances à - d&apos;un an</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_42" model="account.account.template">
-  <field name="code">42</field>
-  <field name="name">Dettes à + d&apos;1 an échéant dans l&apos;année</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_43" model="account.account.template">
-  <field name="code">43</field>
-  <field name="name">Dettes financières</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_44" model="account.account.template">
-  <field name="code">44</field>
-  <field name="name">Dettes commerciales</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_45" model="account.account.template">
-  <field name="code">45</field>
-  <field name="name">Dettes fiscales, salariales et sociales</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_47" model="account.account.template">
-  <field name="code">47</field>
-  <field name="name">Dettes suite à l&apos;affect. des résultats</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_48" model="account.account.template">
-  <field name="code">48</field>
-  <field name="name">Dettes diverses</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_49" model="account.account.template">
-  <field name="code">49</field>
-  <field name="name">Comptes de régularisation et cptes d&apos;att</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_51" model="account.account.template">
-  <field name="code">51</field>
-  <field name="name">Actions et parts</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_52" model="account.account.template">
-  <field name="code">52</field>
-  <field name="name">Titres à revenu fixe</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_53" model="account.account.template">
-  <field name="code">53</field>
-  <field name="name">Dépôts à terme</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_55" model="account.account.template">
-  <field name="code">55</field>
-  <field name="name">Etablissements de crédit</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_56" model="account.account.template">
-  <field name="code">56</field>
-  <field name="name">Ccp</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_57" model="account.account.template">
-  <field name="code">57</field>
-  <field name="name">Caisses</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_60" model="account.account.template">
-  <field name="code">60</field>
-  <field name="name">Approvisionnements et marchandises</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_61" model="account.account.template">
-  <field name="code">61</field>
-  <field name="name">Services et biens divers</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_62" model="account.account.template">
-  <field name="code">62</field>
-  <field name="name">Rémunérations, charges soc. et pensions</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_64" model="account.account.template">
-  <field name="code">64</field>
-  <field name="name">Autres charges d&apos;exploitation</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_65" model="account.account.template">
-  <field name="code">65</field>
-  <field name="name">Charges financières</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_66" model="account.account.template">
-  <field name="code">66</field>
-  <field name="name">Charges exceptionnelles</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_67" model="account.account.template">
-  <field name="code">67</field>
-  <field name="name">Impôts sur le résultat</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_70" model="account.account.template">
-  <field name="code">70</field>
-  <field name="name">Chiffre d&apos;affaires</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_7"/>
-  <field name="type">view</field>
-</record>
-<record id="account_71" model="account.account.template">
-  <field name="code">71</field>
-  <field name="name">Variation des stocks &amp; comm. en cours</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_7"/>
-  <field name="type">view</field>
-</record>
-<record id="account_74" model="account.account.template">
-  <field name="code">74</field>
-  <field name="name">Autres produits d&apos;exploitation</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_7"/>
-  <field name="type">view</field>
-</record>
-<record id="account_75" model="account.account.template">
-  <field name="code">75</field>
-  <field name="name">Produits financiers</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_7"/>
-  <field name="type">view</field>
-</record>
-<record id="account_77" model="account.account.template">
-  <field name="code">77</field>
-  <field name="name">Régul. d&apos;impôts &amp; reprises prov. fisc.</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_7"/>
-  <field name="type">view</field>
-</record>
-<record id="account_140" model="account.account.template">
-  <field name="code">140</field>
-  <field name="name">Bénéfice reporté</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_14"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_175" model="account.account.template">
-  <field name="code">175</field>
-  <field name="name">Dettes commerciales</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_200" model="account.account.template">
-  <field name="code">200</field>
-  <field name="name">Frais de constitution et d&apos;augm. capital</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_20"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_201" model="account.account.template">
-  <field name="code">201</field>
-  <field name="name">Frais d&apos;augmentation de capital</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_20"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_202" model="account.account.template">
-  <field name="code">202</field>
-  <field name="name">Fr.d&apos;emission d&apos;empr,prime remboursement</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_20"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_203" model="account.account.template">
-  <field name="code">203</field>
-  <field name="name">Autres frais d&apos;établissement</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_20"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_204" model="account.account.template">
-  <field name="code">204</field>
-  <field name="name">Frais de restructuration</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_20"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_210" model="account.account.template">
-  <field name="code">210</field>
-  <field name="name">Frais de recherche et de développement</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_21"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_211" model="account.account.template">
-  <field name="code">211</field>
-  <field name="name">Concessions, brevets et licences</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_21"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_212" model="account.account.template">
-  <field name="code">212</field>
-  <field name="name">Fonds de commerce</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_21"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_220" model="account.account.template">
-  <field name="code">220</field>
-  <field name="name">Terrains</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_22"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_221" model="account.account.template">
-  <field name="code">221</field>
-  <field name="name">Constructions</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_22"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_222" model="account.account.template">
-  <field name="code">222</field>
-  <field name="name">Terrains bâtis</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_22"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_223" model="account.account.template">
-  <field name="code">223</field>
-  <field name="name">Autres droits réels sur des immeubles</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_22"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_230" model="account.account.template">
-  <field name="code">230</field>
-  <field name="name">Installations</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_23"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_231" model="account.account.template">
-  <field name="code">231</field>
-  <field name="name">Machines</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_23"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_240" model="account.account.template">
-  <field name="code">240</field>
-  <field name="name">Installation gen, agencements,..</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_24"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_241" model="account.account.template">
-  <field name="code">241</field>
-  <field name="name">Mobilier</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_24"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_242" model="account.account.template">
-  <field name="code">242</field>
-  <field name="name">Matériel roulant</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_24"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_280" model="account.account.template">
-  <field name="code">280</field>
-  <field name="name">Participation dans des entreprises liées</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_28"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_281" model="account.account.template">
-  <field name="code">281</field>
-  <field name="name">Créances sur des entreprises liées</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_28"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_282" model="account.account.template">
-  <field name="code">282</field>
-  <field name="name">Participations entr. avec lien particip.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_28"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_283" model="account.account.template">
-  <field name="code">283</field>
-  <field name="name">Créances / entrepr. avec lien particip.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_28"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_290" model="account.account.template">
-  <field name="code">290</field>
-  <field name="name">Créances commerciales</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_291" model="account.account.template">
-  <field name="code">291</field>
-  <field name="name">Autres créances</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_411" model="account.account.template">
-  <field name="code">411</field>
-  <field name="name">T.v.a en amont</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_425" model="account.account.template">
-  <field name="code">425</field>
-  <field name="name">Dettes commerciales échéant ds l&apos;année</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_451" model="account.account.template">
-  <field name="code">451</field>
-  <field name="name">T.v.a. en aval</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_45"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_452" model="account.account.template">
-  <field name="code">452</field>
-  <field name="name">Impôts et taxes à payer</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_45"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_512" model="account.account.template">
-  <field name="code">512</field>
-  <field name="name">Actions &amp; parts - options acquises</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_51"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_550" model="account.account.template">
-  <field name="code">550</field>
-  <field name="name">Comptes courants bancaires</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_55"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_609" model="account.account.template">
-  <field name="code">609</field>
-  <field name="name">Variation des stocks</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_60"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_610" model="account.account.template">
-  <field name="code">610</field>
-  <field name="name">Loyers et charges locatives</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_61"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_612" model="account.account.template">
-  <field name="code">612</field>
-  <field name="name">Fournitures faites à l&apos;entreprise</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_61"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_613" model="account.account.template">
-  <field name="code">613</field>
-  <field name="name">Rétributions de tiers</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_61"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_615" model="account.account.template">
-  <field name="code">615</field>
-  <field name="name">publicités</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_61"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_620" model="account.account.template">
-  <field name="code">620</field>
-  <field name="name">Rémunérations et avantages soc. directs</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_62"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_621" model="account.account.template">
-  <field name="code">621</field>
-  <field name="name">Charges sociales</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_62"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_624" model="account.account.template">
-  <field name="code">624</field>
-  <field name="name">Pensions</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_62"/>
-</record>
-<record id="account_630" model="account.account.template">
-  <field name="code">630</field>
-  <field name="name">Dotations aux corrections de val./immob.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_631" model="account.account.template">
-  <field name="code">631</field>
-  <field name="name">Dotations aux correct. de val./stocks</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_632" model="account.account.template">
-  <field name="code">632</field>
-  <field name="name">Dot. cor. val s/en-cours,pr fini</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_633" model="account.account.template">
-  <field name="code">633</field>
-  <field name="name">Dotations correct. val./cr. comm. +1an</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_634" model="account.account.template">
-  <field name="code">634</field>
-  <field name="name">Dotations correct. val./cr. comm. -1an</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_635" model="account.account.template">
-  <field name="code">635</field>
-  <field name="name">Provisions pour pensions et oblig. sim.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_636" model="account.account.template">
-  <field name="code">636</field>
-  <field name="name">Provisions pour grosses réparations</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_637" model="account.account.template">
-  <field name="code">637</field>
-  <field name="name">Provisions pour autres risques &amp; charges</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_640" model="account.account.template">
-  <field name="code">640</field>
-  <field name="name">Taxes et impôts directs</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_64"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_651" model="account.account.template">
-  <field name="code">651</field>
-  <field name="name">Réductions de valeur / actifs circulants</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_65"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_660" model="account.account.template">
-  <field name="code">660</field>
-  <field name="name">Dotations aux corrections de val. except</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_66"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_661" model="account.account.template">
-  <field name="code">661</field>
-  <field name="name">Dotations aux corrections de val./financ</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_66"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_662" model="account.account.template">
-  <field name="code">662</field>
-  <field name="name">Provisions pour risques &amp; charges except</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_66"/>
-  <field name="type" >view</field>
-</record>
-<record id="account_750" model="account.account.template">
-  <field name="code">750</field>
-  <field name="name">Produits des immob. financières</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">view</field>
-</record>
-<record id="account_751" model="account.account.template">
-  <field name="code">751</field>
-  <field name="name">Produits des actifs circulants</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">view</field>
-</record>
-<record id="account_1750" model="account.account.template">
-  <field name="code">1750</field>
-  <field name="name">Fournisseurs - dettes en compte</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_175"/>
-  <field name="type">view</field>
-</record>
-<record id="account_1751" model="account.account.template">
-  <field name="code">1751</field>
-  <field name="name">Effets à payer</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_175"/>
-  <field name="type">view</field>
-</record>
-<record id="account_6120" model="account.account.template">
-  <field name="code">6120</field>
-  <field name="name">Eau, gaz, électricité, carburants</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_612"/>
-  <field name="type">view</field>
-</record>
-<record id="account_6123" model="account.account.template">
-  <field name="code">6123</field>
-  <field name="name">Téléphone, télégrammes, frais post.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_612"/>
-  <field name="type">view</field>
-</record>
-<record id="account_100000" model="account.account.template">
-  <field name="code">100000</field>
-  <field name="name">Capital souscrit</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_10"/>
-  <field name="type">other</field>
-</record>
-<record id="account_101000" model="account.account.template">
-  <field name="code">101000</field>
-  <field name="name">Capital non appelé (-)</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_10"/>
-  <field name="type">other</field>
-</record>
-<record id="account_109000" model="account.account.template">
-  <field name="code">109000</field>
-  <field name="name">Compte de l&apos;exploitant</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_10"/>
-  <field name="type">other</field>
-</record>
-<record id="account_110000" model="account.account.template">
-  <field name="code">110000</field>
-  <field name="name">Primes d&apos;émission</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1"/>
-  <field name="type">other</field>
-</record>
-<record id="account_120000" model="account.account.template">
-  <field name="code">120000</field>
-  <field name="name">Plus-values de rééval. sur immob. incorp</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_12"/>
-  <field name="type">other</field>
-</record>
-<record id="account_121000" model="account.account.template">
-  <field name="code">121000</field>
-  <field name="name">Plus-values de rééval. sur immob. corp.</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_12"/>
-  <field name="type">other</field>
-</record>
-<record id="account_122000" model="account.account.template">
-  <field name="code">122000</field>
-  <field name="name">Plus-values de rééval. sur immob. fin.</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_12"/>
-  <field name="type">other</field>
-</record>
-<record id="account_123000" model="account.account.template">
-  <field name="code">123000</field>
-  <field name="name">Plus-values de réévaluation sur stocks</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_12"/>
-  <field name="type">other</field>
-</record>
-<record id="account_124000" model="account.account.template">
-  <field name="code">124000</field>
-  <field name="name">Reprises de réd. de val./plac. de très.</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_12"/>
-  <field name="type">other</field>
-</record>
-<record id="account_130000" model="account.account.template">
-  <field name="code">130000</field>
-  <field name="name">Réserve légale</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_13"/>
-  <field name="type">other</field>
-</record>
-<record id="account_131000" model="account.account.template">
-  <field name="code">131000</field>
-  <field name="name">Réserves indisponibles</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_13"/>
-  <field name="type">other</field>
-</record>
-<record id="account_132000" model="account.account.template">
-  <field name="code">132000</field>
-  <field name="name">Réserves immunisées</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_13"/>
-  <field name="type">other</field>
-</record>
-<record id="account_133000" model="account.account.template">
-  <field name="code">133000</field>
-  <field name="name">Réserves disponibles</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_13"/>
-  <field name="type">other</field>
-</record>
-<record id="account_134000" model="account.account.template">
-  <field name="code">134000</field>
-  <field name="name">Autres reserves</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_13"/>
-  <field name="type">other</field>
-</record>
-<record id="account_140000" model="account.account.template">
-  <field name="code">140000</field>
-  <field name="name">Résultats reportés</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_140"/>
-  <field name="type">other</field>
-</record>
-<record id="account_140100" model="account.account.template">
-  <field name="code">140100</field>
-  <field name="name">Bénéfice de l&apos;exercice</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_140"/>
-  <field name="type">other</field>
-</record>
-<record id="account_140200" model="account.account.template">
-  <field name="code">140200</field>
-  <field name="name">Perte de l&apos;exercice</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_140"/>
-  <field name="type">other</field>
-</record>
-<record id="account_141000" model="account.account.template">
-  <field name="code">141000</field>
-  <field name="name">Perte reportée</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_14"/>
-  <field name="type">other</field>
-</record>
-<record id="account_150000" model="account.account.template">
-  <field name="code">150000</field>
-  <field name="name">Subsides en cap. - montants obtenus</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_15"/>
-  <field name="type">other</field>
-</record>
-<record id="account_151000" model="account.account.template">
-  <field name="code">151000</field>
-  <field name="name">Subsides-montants transf. aux résultats</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_15"/>
-  <field name="type">other</field>
-</record>
-<record id="account_160000" model="account.account.template">
-  <field name="code">160000</field>
-  <field name="name">Provisions pour pensions</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_161000" model="account.account.template">
-  <field name="code">161000</field>
-  <field name="name">Provisions pour charges fiscales</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_162000" model="account.account.template">
-  <field name="code">162000</field>
-  <field name="name">Provisions pr grosses rép. &amp; gros entr.</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_163000" model="account.account.template">
-  <field name="code">163000</field>
-  <field name="name">Provisions pour rente viagère</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_164000" model="account.account.template">
-  <field name="code">164000</field>
-  <field name="name">Provisions pr sûretés pers. et réelles</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_165000" model="account.account.template">
-  <field name="code">165000</field>
-  <field name="name">Provisions diverses</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_165400" model="account.account.template">
-  <field name="code">165400</field>
-  <field name="name">Provisions pour autres risques &amp; charges</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_166000" model="account.account.template">
-  <field name="code">166000</field>
-  <field name="name">Provisions pour charges de commandes</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_168000" model="account.account.template">
-  <field name="code">168000</field>
-  <field name="name">Impôts différés</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_169000" model="account.account.template">
-  <field name="code">169000</field>
-  <field name="name">Autres provisions</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_16"/>
-  <field name="type">other</field>
-</record>
-<record id="account_170000" model="account.account.template">
-  <field name="code">170000</field>
-  <field name="name">Emprunts convertibles</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_171000" model="account.account.template">
-  <field name="code">171000</field>
-  <field name="name">Emprunts obligataires non convertibles</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_172000" model="account.account.template">
-  <field name="code">172000</field>
-  <field name="name">Dettes de loc. - financ. et assimilées</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_173000" model="account.account.template">
-  <field name="code">173000</field>
-  <field name="name">Etablissements de crédit</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_174000" model="account.account.template">
-  <field name="code">174000</field>
-  <field name="name">Autres emprunts</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_175000" model="account.account.template">
-  <field name="code">175000</field>
-  <field name="name">Fournisseurs - entreprises apparentées</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1750"/>
-  <field name="type">other</field>
-</record>
-<record id="account_175010" model="account.account.template">
-  <field name="code">175010</field>
-  <field name="name">Dettes en cpte  - fourniss. ordinaires</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1750"/>
-  <field name="type">other</field>
-</record>
-<record id="account_175100" model="account.account.template">
-  <field name="code">175100</field>
-  <field name="name">Effets à payer - entreprises apparentées</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1751"/>
-  <field name="type">other</field>
-</record>
-<record id="account_175110" model="account.account.template">
-  <field name="code">175110</field>
-  <field name="name">Effets à payer - fournisseurs ordinaires</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_1751"/>
-  <field name="type">other</field>
-</record>
-<record id="account_176000" model="account.account.template">
-  <field name="code">176000</field>
-  <field name="name">Acomptes reçus sur commandes</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_177100" model="account.account.template">
-  <field name="code">177100</field>
-  <field name="name">Entreprises liées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_177200" model="account.account.template">
-  <field name="code">177200</field>
-  <field name="name">Lien de participation</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_178000" model="account.account.template">
-  <field name="code">178000</field>
-  <field name="name">Cautionnements reçus en numéraire</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_179000" model="account.account.template">
-  <field name="code">179000</field>
-  <field name="name">Dettes diverses</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_17"/>
-  <field name="type">other</field>
-</record>
-<record id="account_180000" model="account.account.template">
-  <field name="code">180000</field>
-  <field name="name">Comptes de liaison établiss. &amp; succurs.</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_1"/>
-  <field name="type">other</field>
-</record>
-<record id="account_200000" model="account.account.template">
-  <field name="code">200000</field>
-  <field name="name">Frais de constitution</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_200"/>
-  <field name="type">other</field>
-</record>
-<record id="account_200900" model="account.account.template">
-  <field name="code">200900</field>
-  <field name="name">Amort s/fr de constitution</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_200"/>
-  <field name="type">other</field>
-</record>
-<record id="account_201000" model="account.account.template">
-  <field name="code">201000</field>
-  <field name="name">Frais d&apos;augmentation de capital</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_201"/>
-  <field name="type">other</field>
-</record>
-<record id="account_201900" model="account.account.template">
-  <field name="code">201900</field>
-  <field name="name">Amort s/fr d&apos;augmentation du capital</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_201"/>
-  <field name="type">other</field>
-</record>
-<record id="account_202000" model="account.account.template">
-  <field name="code">202000</field>
-  <field name="name">Fr.d&apos;emission d&apos;empr,prime remboursement</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_202"/>
-  <field name="type">other</field>
-</record>
-<record id="account_202900" model="account.account.template">
-  <field name="code">202900</field>
-  <field name="name">Amort s/fr d&apos;émission d&apos;emprunts</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_202"/>
-  <field name="type">other</field>
-</record>
-<record id="account_203000" model="account.account.template">
-  <field name="code">203000</field>
-  <field name="name">Autres frais d&apos;établissement</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_203"/>
-  <field name="type">other</field>
-</record>
-<record id="account_203900" model="account.account.template">
-  <field name="code">203900</field>
-  <field name="name">Amort s/autres fr d&apos;établissement</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_203"/>
-  <field name="type">other</field>
-</record>
-<record id="account_204000" model="account.account.template">
-  <field name="code">204000</field>
-  <field name="name">Frais de restructuration</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_204"/>
-  <field name="type">other</field>
-</record>
-<record id="account_204900" model="account.account.template">
-  <field name="code">204900</field>
-  <field name="name">Amort s/fr de restructuration</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_204"/>
-  <field name="type">other</field>
-</record>
-<record id="account_210000" model="account.account.template">
-  <field name="code">210000</field>
-  <field name="name">Frais de recherche et développement</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_210"/>
-  <field name="type">other</field>
-</record>
-<record id="account_210900" model="account.account.template">
-  <field name="code">210900</field>
-  <field name="name">Amort. s/fr de recherche et développemen</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_210"/>
-  <field name="type">other</field>
-</record>
-<record id="account_211100" model="account.account.template">
-  <field name="code">211100</field>
-  <field name="name">Concessions, brevet à titre onéreux</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_211"/>
-  <field name="type">other</field>
-</record>
-<record id="account_211190" model="account.account.template">
-  <field name="code">211190</field>
-  <field name="name">Amort. s/concession, brevet acquis</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_211"/>
-  <field name="type">other</field>
-</record>
-<record id="account_211200" model="account.account.template">
-  <field name="code">211200</field>
-  <field name="name">Conc., brevets créés par l&apos;entr. même</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_211"/>
-  <field name="type">other</field>
-</record>
-<record id="account_211290" model="account.account.template">
-  <field name="code">211290</field>
-  <field name="name">Amort. s/concession, brevets créés</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_211"/>
-  <field name="type">other</field>
-</record>
-<record id="account_212000" model="account.account.template">
-  <field name="code">212000</field>
-  <field name="name">Fonds de commerce</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_212"/>
-  <field name="type">other</field>
-</record>
-<record id="account_212900" model="account.account.template">
-  <field name="code">212900</field>
-  <field name="name">Amort s/fonds de commerce</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_212"/>
-  <field name="type">other</field>
-</record>
-<record id="account_213000" model="account.account.template">
-  <field name="code">213000</field>
-  <field name="name">Acomptes versés s/immob. incorp</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_21"/>
-  <field name="type">other</field>
-</record>
-<record id="account_214000" model="account.account.template">
-  <field name="code">214000</field>
-  <field name="name">Surprix afférent à l&apos;acquisit. d&apos;1 part.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_21"/>
-  <field name="type">other</field>
-</record>
-<record id="account_220000" model="account.account.template">
-  <field name="code">220000</field>
-  <field name="name">Terrains</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_220"/>
-  <field name="type">other</field>
-</record>
-<record id="account_220800" model="account.account.template">
-  <field name="code">220800</field>
-  <field name="name">Plus-values actées sur terrains</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_220"/>
-  <field name="type">other</field>
-</record>
-<record id="account_220900" model="account.account.template">
-  <field name="code">220900</field>
-  <field name="name">Réduction de valeur sur terrains</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_220"/>
-  <field name="type">other</field>
-</record>
-<record id="account_221800" model="account.account.template">
-  <field name="code">221800</field>
-  <field name="name">Plus-values actées sur constructions</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_221"/>
-  <field name="type">other</field>
-</record>
-<record id="account_221900" model="account.account.template">
-  <field name="code">221900</field>
-  <field name="name">Amort. sur constructions</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_221"/>
-  <field name="type">other</field>
-</record>
-<record id="account_222800" model="account.account.template">
-  <field name="code">222800</field>
-  <field name="name">Plus-values actées s/terrains bâtis</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_222"/>
-  <field name="type">other</field>
-</record>
-<record id="account_222900" model="account.account.template">
-  <field name="code">222900</field>
-  <field name="name">Amort. sur terrains bâtis</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_222"/>
-  <field name="type">other</field>
-</record>
-<record id="account_223800" model="account.account.template">
-  <field name="code">223800</field>
-  <field name="name">+values actées s/autres droits</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_223"/>
-  <field name="type">other</field>
-</record>
-<record id="account_223900" model="account.account.template">
-  <field name="code">223900</field>
-  <field name="name">Amort s/autres droits réels</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_223"/>
-  <field name="type">other</field>
-</record>
-<record id="account_230000" model="account.account.template">
-  <field name="code">230000</field>
-  <field name="name">Installations techniques</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_230"/>
-  <field name="type">other</field>
-</record>
-<record id="account_230900" model="account.account.template">
-  <field name="code">230900</field>
-  <field name="name">Amort s/installations techniques</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_230"/>
-  <field name="type">other</field>
-</record>
-<record id="account_231000" model="account.account.template">
-  <field name="code">231000</field>
-  <field name="name">Machines</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_231"/>
-  <field name="type">other</field>
-</record>
-<record id="account_231900" model="account.account.template">
-  <field name="code">231900</field>
-  <field name="name">Amortissement s/machines</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_231"/>
-  <field name="type">other</field>
-</record>
-<record id="account_232000" model="account.account.template">
-  <field name="code">232000</field>
-  <field name="name">Outillage</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_23"/>
-  <field name="type">other</field>
-</record>
-<record id="account_233000" model="account.account.template">
-  <field name="code">233000</field>
-  <field name="name">Pièces de rechange</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_23"/>
-  <field name="type">other</field>
-</record>
-<record id="account_238000" model="account.account.template">
-  <field name="code">238000</field>
-  <field name="name">Plus-values actées sur i./m./o.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_23"/>
-  <field name="type">other</field>
-</record>
-<record id="account_239000" model="account.account.template">
-  <field name="code">239000</field>
-  <field name="name">Amortissements sur i./m./o.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_23"/>
-  <field name="type">other</field>
-</record>
-<record id="account_240000" model="account.account.template">
-  <field name="code">240000</field>
-  <field name="name">Installation gen, agencements,..</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_240"/>
-  <field name="type">other</field>
-</record>
-<record id="account_240900" model="account.account.template">
-  <field name="code">240900</field>
-  <field name="name">Amort s/autres installations,outillage</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_240"/>
-  <field name="type">other</field>
-</record>
-<record id="account_241000" model="account.account.template">
-  <field name="code">241000</field>
-  <field name="name">Mobilier</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_241"/>
-  <field name="type">other</field>
-</record>
-<record id="account_241900" model="account.account.template">
-  <field name="code">241900</field>
-  <field name="name">Amort. sur mobilier</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_241"/>
-  <field name="type">other</field>
-</record>
-<record id="account_242000" model="account.account.template">
-  <field name="code">242000</field>
-  <field name="name">Matériel roulant</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_242"/>
-  <field name="type">other</field>
-</record>
-<record id="account_242900" model="account.account.template">
-  <field name="code">242900</field>
-  <field name="name">Amort. s/matériel roulant</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_242"/>
-  <field name="type">other</field>
-</record>
-<record id="account_243000" model="account.account.template">
-  <field name="code">243000</field>
-  <field name="name">Matériel de bureau</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_24"/>
-  <field name="type">other</field>
-</record>
-<record id="account_243900" model="account.account.template">
-  <field name="code">243900</field>
-  <field name="name">Amort. s/matériel de bureau</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_24"/>
-  <field name="type">other</field>
-</record>
-<record id="account_250000" model="account.account.template">
-  <field name="code">250000</field>
-  <field name="name">Terrains et constructions en loc.-fin.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_25"/>
-  <field name="type">other</field>
-</record>
-<record id="account_251000" model="account.account.template">
-  <field name="code">251000</field>
-  <field name="name">Install., machines &amp; out. en loc.-fin.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_25"/>
-  <field name="type">other</field>
-</record>
-<record id="account_252000" model="account.account.template">
-  <field name="code">252000</field>
-  <field name="name">Mobilier et mat. roulant en loc.-fin.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_25"/>
-  <field name="type">other</field>
-</record>
-<record id="account_260000" model="account.account.template">
-  <field name="code">260000</field>
-  <field name="name">Autres immobilisations corporelles</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_2"/>
-  <field name="type">other</field>
-</record>
-<record id="account_270000" model="account.account.template">
-  <field name="code">270000</field>
-  <field name="name">Immobilisations en cours</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_27"/>
-  <field name="type">other</field>
-</record>
-<record id="account_271000" model="account.account.template">
-  <field name="code">271000</field>
-  <field name="name">Avances &amp; acptes versés / immob.en cours</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_27"/>
-  <field name="type">other</field>
-</record>
-<record id="account_280000" model="account.account.template">
-  <field name="code">280000</field>
-  <field name="name">Parts dans des entreprises  liées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_280"/>
-  <field name="type">other</field>
-</record>
-<record id="account_280100" model="account.account.template">
-  <field name="code">280100</field>
-  <field name="name">Montants non appelés</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_280"/>
-  <field name="type">other</field>
-</record>
-<record id="account_280800" model="account.account.template">
-  <field name="code">280800</field>
-  <field name="name">+values actées s/parts entreprises liées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_280"/>
-  <field name="type">other</field>
-</record>
-<record id="account_280900" model="account.account.template">
-  <field name="code">280900</field>
-  <field name="name">Réduction de valeur s/parts</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_280"/>
-  <field name="type">other</field>
-</record>
-<record id="account_281000" model="account.account.template">
-  <field name="code">281000</field>
-  <field name="name">Créances s/des entreprises liées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_281"/>
-  <field name="type">other</field>
-</record>
-<record id="account_281100" model="account.account.template">
-  <field name="code">281100</field>
-  <field name="name">Effets à recevoir</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_281"/>
-  <field name="type">other</field>
-</record>
-<record id="account_281700" model="account.account.template">
-  <field name="code">281700</field>
-  <field name="name">Créances douteuses (entreprises liées)</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_281"/>
-  <field name="type">other</field>
-</record>
-<record id="account_281900" model="account.account.template">
-  <field name="code">281900</field>
-  <field name="name">Réduction de valeur s/cré. entre. liées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_281"/>
-  <field name="type">other</field>
-</record>
-<record id="account_282000" model="account.account.template">
-  <field name="code">282000</field>
-  <field name="name">Participations</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_282"/>
-  <field name="type">other</field>
-</record>
-<record id="account_282100" model="account.account.template">
-  <field name="code">282100</field>
-  <field name="name">Montants non appelés</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_282"/>
-  <field name="type">other</field>
-</record>
-<record id="account_282800" model="account.account.template">
-  <field name="code">282800</field>
-  <field name="name">+values actées s/participations</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_282"/>
-  <field name="type">other</field>
-</record>
-<record id="account_282900" model="account.account.template">
-  <field name="code">282900</field>
-  <field name="name">Réduction de valeur s/participations</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_282"/>
-  <field name="type">other</field>
-</record>
-<record id="account_283000" model="account.account.template">
-  <field name="code">283000</field>
-  <field name="name">Créances s/entrepr. lien de particip.</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_283"/>
-  <field name="type">other</field>
-</record>
-<record id="account_283100" model="account.account.template">
-  <field name="code">283100</field>
-  <field name="name">Effets à recevoir</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_283"/>
-  <field name="type">other</field>
-</record>
-<record id="account_283200" model="account.account.template">
-  <field name="code">283200</field>
-  <field name="name">Titres à revenu fixe</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_283"/>
-  <field name="type">other</field>
-</record>
-<record id="account_283700" model="account.account.template">
-  <field name="code">283700</field>
-  <field name="name">Créances douteuses (s/participations)</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_283"/>
-  <field name="type">other</field>
-</record>
-<record id="account_283900" model="account.account.template">
-  <field name="code">283900</field>
-  <field name="name">Réductions de valeur s/cr particip.</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_283"/>
-  <field name="type">other</field>
-</record>
-<record id="account_284000" model="account.account.template">
-  <field name="code">284000</field>
-  <field name="name">Titres à caractère d&apos;immobilisation</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_28"/>
-  <field name="type">other</field>
-</record>
-<record id="account_285000" model="account.account.template">
-  <field name="code">285000</field>
-  <field name="name">Autres prêts</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_28"/>
-  <field name="type">other</field>
-</record>
-<record id="account_286000" model="account.account.template">
-  <field name="code">286000</field>
-  <field name="name">Actions ou parts propres</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_28"/>
-  <field name="type">other</field>
-</record>
-<record id="account_288000" model="account.account.template">
-  <field name="code">288000</field>
-  <field name="name">Cautionnements versés en numéraire</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_28"/>
-  <field name="type">other</field>
-</record>
-<record id="account_290000" model="account.account.template">
-  <field name="code">290000</field>
-  <field name="name">Créances commerciales</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_290"/>
-  <field name="type">other</field>
-</record>
-<record id="account_290100" model="account.account.template">
-  <field name="code">290100</field>
-  <field name="name">Effets à recevoir</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_290"/>
-  <field name="type">other</field>
-</record>
-<record id="account_290600" model="account.account.template">
-  <field name="code">290600</field>
-  <field name="name">Acomptes versés</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_290"/>
-  <field name="type">other</field>
-</record>
-<record id="account_290700" model="account.account.template">
-  <field name="code">290700</field>
-  <field name="name">Créances douteuses s/cr commerciales</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_290"/>
-  <field name="type">other</field>
-</record>
-<record id="account_290900" model="account.account.template">
-  <field name="code">290900</field>
-  <field name="name">Réduction de valeur s/cr commerciales</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_290"/>
-  <field name="type">other</field>
-</record>
-<record id="account_291000" model="account.account.template">
-  <field name="code">291000</field>
-  <field name="name">Autres créances</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_291"/>
-  <field name="type">other</field>
-</record>
-<record id="account_291100" model="account.account.template">
-  <field name="code">291100</field>
-  <field name="name">Effets à recevoir</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_291"/>
-  <field name="type">other</field>
-</record>
-<record id="account_291700" model="account.account.template">
-  <field name="code">291700</field>
-  <field name="name">Créances douteuses s/autres créances</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_291"/>
-  <field name="type">other</field>
-</record>
-<record id="account_291900" model="account.account.template">
-  <field name="code">291900</field>
-  <field name="name">Réduction de valeur s/autres créances</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_291"/>
-  <field name="type">other</field>
-</record>
-<record id="account_300000" model="account.account.template">
-  <field name="code">300000</field>
-  <field name="name">Stocks matières premières val. d&apos;acquis.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_30"/>
-  <field name="type">other</field>
-</record>
-<record id="account_309000" model="account.account.template">
-  <field name="code">309000</field>
-  <field name="name">Réduction de valeur s/mat. premières</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_30"/>
-  <field name="type">other</field>
-</record>
-<record id="account_310000" model="account.account.template">
-  <field name="code">310000</field>
-  <field name="name">Matières consommables</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_31"/>
-  <field name="type">other</field>
-</record>
-<record id="account_310600" model="account.account.template">
-  <field name="code">310600</field>
-  <field name="name">Emballages commerciaux</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_31"/>
-  <field name="type">other</field>
-</record>
-<record id="account_319000" model="account.account.template">
-  <field name="code">319000</field>
-  <field name="name">Réd. de val. - stocks fournitures (-)</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_31"/>
-  <field name="type">other</field>
-</record>
-<record id="account_320000" model="account.account.template">
-  <field name="code">320000</field>
-  <field name="name">En cours de fabrication - val. d&apos;acquis.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_32"/>
-  <field name="type">other</field>
-</record>
-<record id="account_329000" model="account.account.template">
-  <field name="code">329000</field>
-  <field name="name">Réductions de valeur / en cours (-)</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_32"/>
-  <field name="type">other</field>
-</record>
-<record id="account_330000" model="account.account.template">
-  <field name="code">330000</field>
-  <field name="name">Valeur d&apos;acquisition des produits finis</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_33"/>
-  <field name="type">other</field>
-</record>
-<record id="account_339000" model="account.account.template">
-  <field name="code">339000</field>
-  <field name="name">Réduction de val. / produits finis (-)</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_33"/>
-  <field name="type">other</field>
-</record>
-<record id="account_340000" model="account.account.template">
-  <field name="code">340000</field>
-  <field name="name">Stocks marchandises - valeur d&apos;acquis.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_34"/>
-  <field name="type">other</field>
-</record>
-<record id="account_349000" model="account.account.template">
-  <field name="code">349000</field>
-  <field name="name">Réd. de val. / stocks marchandises (-)</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_34"/>
-  <field name="type">other</field>
-</record>
-<record id="account_360000" model="account.account.template">
-  <field name="code">360000</field>
-  <field name="name">Acomptes versés / achats pour stocks</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_36"/>
-  <field name="type">other</field>
-</record>
-<record id="account_369000" model="account.account.template">
-  <field name="code">369000</field>
-  <field name="name">Réd. de val. / acptes versés stocks (-)</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_36"/>
-  <field name="type">other</field>
-</record>
-<record id="account_400000" model="account.account.template">
-  <field name="code">400000</field>
-  <field name="name">Clients</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_40"/>
-  <field name="type">other</field>
-</record>
-<record id="account_401000" model="account.account.template">
-  <field name="code">401000</field>
-  <field name="name">Effets à recevoir - clients</field>
-  <field name="user_type" ref="account_type_asset"/>
-  <field name="reconcile">True</field>
-
-  <field name="parent_id" ref="account_40"/>
-  <field name="type">receivable</field>
-
-</record>
-<record id="account_403000" model="account.account.template">
-  <field name="code">403000</field>
-  <field name="name">Créances s/entreprises apparentées</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_40"/>
-  <field name="type">receivable</field>
-</record>
-<record id="account_404000" model="account.account.template">
-  <field name="code">404000</field>
-  <field name="name">Produits à recevoir (factures à établir)</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_40"/>
-  <field name="type">other</field>
-</record>
-<record id="account_406000" model="account.account.template">
-  <field name="code">406000</field>
-  <field name="name">Acomptes versés aux fournisseurs</field>
-  <field name="user_type" ref="account_type_creances"/>
-
-  <field name="parent_id" ref="account_40"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_407000" model="account.account.template">
-  <field name="code">407000</field>
-  <field name="name">Créances commerciales douteuses</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_40"/>
-  <field name="type">other</field>
-</record>
-<record id="account_408000" model="account.account.template">
-  <field name="code">408000</field>
-  <field name="name">Ecarts de conversion de devises/créances</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_40"/>
-  <field name="type">other</field>
-</record>
-<record id="account_409000" model="account.account.template">
-  <field name="code">409000</field>
-  <field name="name">Réductions de valeur / créances comm.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_40"/>
-  <field name="type">other</field>
-</record>
-<record id="account_410000" model="account.account.template">
-  <field name="code">410000</field>
-  <field name="name">Capital appelé, non versé</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type">other</field>
-</record>
-<record id="account_411000" model="account.account.template">
-  <field name="code">411000</field>
-  <field name="name">T.v.a en amont</field>
-  <field name="user_type" ref="account_type_asset"/>
-  <field name="reconcile">True</field>
-  <field name="parent_id" ref="account_411"/>
-  <field name="type">other</field>
-</record>
-<record id="account_411100" model="account.account.template">
-  <field name="code">411100</field>
-  <field name="name">T.v.a soumise à l&apos;origine amont</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_411"/>
-  <field name="type">other</field>
-</record>
-<record id="account_411500" model="account.account.template">
-  <field name="code">411500</field>
-  <field name="name">Compte courant tva</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_411"/>
-  <field name="type">other</field>
-</record>
-<record id="account_412000" model="account.account.template">
-  <field name="code">412000</field>
-  <field name="name">Impots et vers. fiscaux à récupérer</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type">other</field>
-</record>
-<record id="account_413100" model="account.account.template">
-  <field name="code">413100</field>
-  <field name="name">Autres créances sur entrepr. liées</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type">other</field>
-</record>
-<record id="account_413200" model="account.account.template">
-  <field name="code">413200</field>
-  <field name="name">Autres créances / entrepr. apparentées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type">other</field>
-</record>
-<record id="account_414000" model="account.account.template">
-  <field name="code">414000</field>
-  <field name="name">Produits à recevoir (non commerciaux)</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type">other</field>
-</record>
-<record id="account_416000" model="account.account.template">
-  <field name="code">416000</field>
-  <field name="name">Créances diverses</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type">other</field>
-</record>
-<record id="account_417000" model="account.account.template">
-  <field name="code">417000</field>
-  <field name="name">Créances douteuses</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type">other</field>
-</record>
-<record id="account_418000" model="account.account.template">
-  <field name="code">418000</field>
-  <field name="name">Cautionnements versés en numéraire</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type">other</field>
-</record>
-<record id="account_419000" model="account.account.template">
-  <field name="code">419000</field>
-  <field name="name">Réductions de val. / autres créances (-)</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_41"/>
-  <field name="type">other</field>
-</record>
-<record id="account_420000" model="account.account.template">
-  <field name="code">420000</field>
-  <field name="name">Emprunts obligataires convert.</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_421000" model="account.account.template">
-  <field name="code">421000</field>
-  <field name="name">Emprunts oblig. non convertibles</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_422000" model="account.account.template">
-  <field name="code">422000</field>
-  <field name="name">Dettes de location-financ. et assimilées</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_423000" model="account.account.template">
-  <field name="code">423000</field>
-  <field name="name">Etablissements de crédit</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_424000" model="account.account.template">
-  <field name="code">424000</field>
-  <field name="name">Autres emprunts</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_425000" model="account.account.template">
-  <field name="code">425000</field>
-  <field name="name">Fournisseurs</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_425"/>
-  <field name="type">other</field>
-</record>
-<record id="account_425100" model="account.account.template">
-  <field name="code">425100</field>
-  <field name="name">Effets à payer</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_425"/>
-  <field name="type">other</field>
-</record>
-<record id="account_426000" model="account.account.template">
-  <field name="code">426000</field>
-  <field name="name">Acomptes reçus / commandes éch. ds l&apos;an</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_427100" model="account.account.template">
-  <field name="code">427100</field>
-  <field name="name">Entreprises liées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_427200" model="account.account.template">
-  <field name="code">427200</field>
-  <field name="name">Lien de participation</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_428000" model="account.account.template">
-  <field name="code">428000</field>
-  <field name="name">Cautionnements reçus en numéraire</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_429000" model="account.account.template">
-  <field name="code">429000</field>
-  <field name="name">Dettes diverses échéant dans l&apos;année</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_42"/>
-  <field name="type">other</field>
-</record>
-<record id="account_430000" model="account.account.template">
-  <field name="code">430000</field>
-  <field name="name">Banques-emprunts en compte à terme fixe</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_43"/>
-  <field name="type">other</field>
-</record>
-<record id="account_431000" model="account.account.template">
-  <field name="code">431000</field>
-  <field name="name">Banques-promesses</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_43"/>
-  <field name="type">other</field>
-</record>
-<record id="account_432000" model="account.account.template">
-  <field name="code">432000</field>
-  <field name="name">Banques-crédit d&apos;acceptation</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_43"/>
-  <field name="type">other</field>
-</record>
-<record id="account_433000" model="account.account.template">
-  <field name="code">433000</field>
-  <field name="name">Banques-dettes en compte courant</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_43"/>
-  <field name="type">other</field>
-</record>
-<record id="account_438000" model="account.account.template">
-  <field name="code">438000</field>
-  <field name="name">Autres emprunts</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_43"/>
-  <field name="type">other</field>
-</record>
-<record id="account_440000" model="account.account.template">
-  <field name="code">440000</field>
-  <field name="name">Fournisseurs</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_44"/>
-  <field name="type">other</field>
-</record>
-<record id="account_441000" model="account.account.template">
-  <field name="code">441000</field>
-  <field name="name">Effets à payer</field>
-  <field name="user_type" ref="account_type_liability"/>
-  <field name="reconcile">True</field>
-
-  <field name="parent_id" ref="account_44"/>
-  <field name="type">other</field>
-</record>
-<record id="account_442000" model="account.account.template">
-  <field name="code">442000</field>
-  <field name="name">Factures à recevoir</field>
-  <field name="user_type" ref="account_type_root"/>
-  <field name="reconcile">True</field>
-
-  <field name="parent_id" ref="account_44"/>
-  <field name="type">other</field>
-</record>
-<record id="account_443100" model="account.account.template">
-  <field name="code">443100</field>
-  <field name="name">Entreprises liées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_44"/>
-  <field name="type">other</field>
-</record>
-<record id="account_443200" model="account.account.template">
-  <field name="code">443200</field>
-  <field name="name">Lien de participation</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_44"/>
-  <field name="type">other</field>
-</record>
-<record id="account_450000" model="account.account.template">
-  <field name="code">450000</field>
-  <field name="name">Dettes fiscales estimées</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_45"/>
-  <field name="type">other</field>
-</record>
-<record id="account_451000" model="account.account.template">
-  <field name="code">451000</field>
-  <field name="name">T.v.a en aval</field>
-  <field name="user_type" ref="account_type_liability"/>
-  <field name="reconcile">True</field>
-
-  <field name="parent_id" ref="account_451"/>
-  <field name="type">other</field>
-</record>
-<record id="account_451100" model="account.account.template">
-  <field name="code">451100</field>
-  <field name="name">T.v.a soumise à l&apos;origine aval</field>
-  <field name="user_type" ref="account_type_root"/>
-  <field name="reconcile">True</field>
-
-  <field name="parent_id" ref="account_451"/>
-  <field name="type">other</field>
-</record>
-<record id="account_451200" model="account.account.template">
-  <field name="code">451200</field>
-  <field name="name">T.v.a intracom</field>
-  <field name="user_type" ref="account_type_root"/>
-  <field name="reconcile">True</field>
-
-  <field name="parent_id" ref="account_451"/>
-  <field name="type">other</field>
-</record>
-<record id="account_451500" model="account.account.template">
-  <field name="code">451500</field>
-  <field name="name">Compte courant tva</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_451"/>
-  <field name="type">other</field>
-</record>
-<record id="account_452000" model="account.account.template">
-  <field name="code">452000</field>
-  <field name="name">Impôts et taxes à payer à l&apos;état</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_452"/>
-  <field name="type">other</field>
-</record>
-<record id="account_452100" model="account.account.template">
-  <field name="code">452100</field>
-  <field name="name">Impôts et taxes à payer aux adm commun</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_452"/>
-  <field name="type">other</field>
-</record>
-<record id="account_453000" model="account.account.template">
-  <field name="code">453000</field>
-  <field name="name">Retenues s/salaires</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_45"/>
-  <field name="type">other</field>
-</record>
-<record id="account_454000" model="account.account.template">
-  <field name="code">454000</field>
-  <field name="name">Cass (centre..de sécurite soc)</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_45"/>
-  <field name="type">other</field>
-</record>
-<record id="account_455000" model="account.account.template">
-  <field name="code">455000</field>
-  <field name="name">Personnel-rémuneration à payer</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_45"/>
-  <field name="type">other</field>
-</record>
-<record id="account_456000" model="account.account.template">
-  <field name="code">456000</field>
-  <field name="name">Personnel-avances et acomptes</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_45"/>
-  <field name="type">other</field>
-</record>
-<record id="account_458000" model="account.account.template">
-  <field name="code">458000</field>
-  <field name="name">Autres dettes sociales</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_45"/>
-  <field name="type">other</field>
-</record>
-<record id="account_460000" model="account.account.template">
-  <field name="code">460000</field>
-  <field name="name">Acomptes reçus sur commandes</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_4"/>
-  <field name="type">other</field>
-</record>
-<record id="account_470000" model="account.account.template">
-  <field name="code">470000</field>
-  <field name="name">Dividendes-tantièmes d&apos;ex. ant. à payer</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_47"/>
-  <field name="type">other</field>
-</record>
-<record id="account_471000" model="account.account.template">
-  <field name="code">471000</field>
-  <field name="name">Dividendes de l&apos;exercice à payer</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_47"/>
-  <field name="type">other</field>
-</record>
-<record id="account_472000" model="account.account.template">
-  <field name="code">472000</field>
-  <field name="name">Tantièmes de l&apos;exercice à payer</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_47"/>
-  <field name="type">other</field>
-</record>
-<record id="account_473000" model="account.account.template">
-  <field name="code">473000</field>
-  <field name="name">Autres allocataires à payer</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_47"/>
-  <field name="type">other</field>
-</record>
-<record id="account_480000" model="account.account.template">
-  <field name="code">480000</field>
-  <field name="name">Obligations et coupons échus (dettes)</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_48"/>
-  <field name="type">other</field>
-</record>
-<record id="account_487000" model="account.account.template">
-  <field name="code">487000</field>
-  <field name="name">Cautionnements reçus en numeraire</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_48"/>
-  <field name="type">other</field>
-</record>
-<record id="account_488000" model="account.account.template">
-  <field name="code">488000</field>
-  <field name="name">Autres dettes diverses</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_48"/>
-  <field name="type">other</field>
-</record>
-<record id="account_490000" model="account.account.template">
-  <field name="code">490000</field>
-  <field name="name">Charges à reporter (payées d&apos;avance)</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_49"/>
-  <field name="type">other</field>
-</record>
-<record id="account_491000" model="account.account.template">
-  <field name="code">491000</field>
-  <field name="name">Produits acquis</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_49"/>
-  <field name="type">other</field>
-</record>
-<record id="account_492000" model="account.account.template">
-  <field name="code">492000</field>
-  <field name="name">Charges à imputer</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_49"/>
-  <field name="type">other</field>
-</record>
-<record id="account_493000" model="account.account.template">
-  <field name="code">493000</field>
-  <field name="name">Produits à reporter</field>
-  <field name="user_type" ref="account_type_liability"/>
-
-  <field name="parent_id" ref="account_49"/>
-  <field name="type">other</field>
-</record>
-<record id="account_499000" model="account.account.template">
-  <field name="code">499000</field>
-  <field name="name">Comptes d&apos;attente</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_49"/>
-  <field name="type">other</field>
-</record>
-<record id="account_499800" model="account.account.template">
-  <field name="code">499800</field>
-  <field name="name">Solde équilibre en devises (hors pc)</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_49"/>
-  <field name="type">other</field>
-</record>
-<record id="account_500000" model="account.account.template">
-  <field name="code">500000</field>
-  <field name="name">Actions propres</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type">other</field>
-</record>
-<record id="account_510000" model="account.account.template">
-  <field name="code">510000</field>
-  <field name="name">Actions et parts</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_51"/>
-  <field name="type">other</field>
-</record>
-<record id="account_510100" model="account.account.template">
-  <field name="code">510100</field>
-  <field name="name">Montant non appelé s/action.part</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_51"/>
-  <field name="type">other</field>
-</record>
-<record id="account_510900" model="account.account.template">
-  <field name="code">510900</field>
-  <field name="name">Réduction valeur s/action et parts</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_51"/>
-  <field name="type">other</field>
-</record>
-<record id="account_512000" model="account.account.template">
-  <field name="code">512000</field>
-  <field name="name">Parts dans entreprises liées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_512"/>
-  <field name="type">other</field>
-</record>
-<record id="account_512100" model="account.account.template">
-  <field name="code">512100</field>
-  <field name="name">Montant non appelé s/parts</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_512"/>
-  <field name="type">other</field>
-</record>
-<record id="account_512900" model="account.account.template">
-  <field name="code">512900</field>
-  <field name="name">Réduction valeur s/part ent. liées</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_512"/>
-  <field name="type">other</field>
-</record>
-<record id="account_520000" model="account.account.template">
-  <field name="code">520000</field>
-  <field name="name">Titres à rev. fixes - valeur d&apos;acquis.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_52"/>
-  <field name="type">other</field>
-</record>
-<record id="account_529000" model="account.account.template">
-  <field name="code">529000</field>
-  <field name="name">Titres à rev. fixes - réd. de val.</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_52"/>
-  <field name="type">other</field>
-</record>
-<record id="account_530000" model="account.account.template">
-  <field name="code">530000</field>
-  <field name="name">Dépôts à terme</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_53"/>
-  <field name="type">other</field>
-</record>
-<record id="account_539000" model="account.account.template">
-  <field name="code">539000</field>
-  <field name="name">Réductions de valeur / dépôts à terme</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_53"/>
-  <field name="type">other</field>
-</record>
-<record id="account_540000" model="account.account.template">
-  <field name="code">540000</field>
-  <field name="name">Valeurs échues à l&apos;encaissement</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type">other</field>
-</record>
-<record id="account_541000" model="account.account.template">
-  <field name="code">541000</field>
-  <field name="name">Coupons à encaisser</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type">other</field>
-</record>
-<record id="account_550000" model="account.account.template">
-  <field name="code">550000</field>
-  <field name="name">Ets de crédit-compte à vue</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_550"/>
-  <field name="type">other</field>
-</record>
-<record id="account_550100" model="account.account.template">
-  <field name="code">550100</field>
-  <field name="name">Chèques et virements émis</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_550"/>
-  <field name="type">other</field>
-</record>
-<record id="account_550900" model="account.account.template">
-  <field name="code">550900</field>
-  <field name="name">Réduction valeur s/cpte a vue</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_550"/>
-  <field name="type">other</field>
-</record>
-<record id="account_560000" model="account.account.template">
-  <field name="code">560000</field>
-  <field name="name">Ccp - compte courant</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_56"/>
-  <field name="type">other</field>
-</record>
-<record id="account_561000" model="account.account.template">
-  <field name="code">561000</field>
-  <field name="name">Ccp - chèques émis</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_56"/>
-  <field name="type">other</field>
-</record>
-<record id="account_570000" model="account.account.template">
-  <field name="code">570000</field>
-  <field name="name">Caisses</field>
-  <field name="user_type" ref="account_type_asset"/>
-
-  <field name="parent_id" ref="account_57"/>
-  <field name="type">other</field>
-</record>
-<record id="account_570900" model="account.account.template">
-  <field name="code">570900</field>
-  <field name="name">Réduction valeur s/caisse</field>
-  <field name="user_type" ref="account_type_root"/>
-
-  <field name="parent_id" ref="account_57"/>
-  <field name="type">other</field>
-</record>
-<record id="account_580000" model="account.account.template">
-  <field name="code">580000</field>
-  <field name="name">Virements internes</field>
-  <field name="user_type" ref="account_type_root"/>
-  <field name="reconcile">True</field>
-
-  <field name="parent_id" ref="account_5"/>
-  <field name="type">other</field>
-</record>
-<record id="account_600000" model="account.account.template">
-  <field name="code">600000</field>
-  <field name="name">Achats de matières premières</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_60"/>
-  <field name="type">other</field>
-</record>
-<record id="account_601000" model="account.account.template">
-  <field name="code">601000</field>
-  <field name="name">Achats de fournitures</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_60"/>
-  <field name="type">other</field>
-</record>
-<record id="account_602000" model="account.account.template">
-  <field name="code">602000</field>
-  <field name="name">Achats de services, travaux et études</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_60"/>
-  <field name="type">other</field>
-</record>
-<record id="account_603000" model="account.account.template">
-  <field name="code">603000</field>
-  <field name="name">Achats de sous-traitances générales</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_60"/>
-  <field name="type">other</field>
-</record>
-<record id="account_604000" model="account.account.template">
-  <field name="code">604000</field>
-  <field name="name">Achats de marchandises</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_60"/>
-  <field name="type">other</field>
-</record>
-<record id="account_607000" model="account.account.template">
-  <field name="code">607000</field>
-  <field name="name">Achats  produits et demi-produits</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_60"/>
-  <field name="type">other</field>
-</record>
-<record id="account_608000" model="account.account.template">
-  <field name="code">608000</field>
-  <field name="name">Remises, ristournes et rabais sur achats</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_60"/>
-  <field name="type">other</field>
-</record>
-<record id="account_609000" model="account.account.template">
-  <field name="code">609000</field>
-  <field name="name">Variation de stock mat. premières</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_609"/>
-  <field name="type">other</field>
-</record>
-<record id="account_609100" model="account.account.template">
-  <field name="code">609100</field>
-  <field name="name">Variation stock mat. consommables</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_609"/>
-  <field name="type">other</field>
-</record>
-<record id="account_609400" model="account.account.template">
-  <field name="code">609400</field>
-  <field name="name">Variation stock marchandises</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_609"/>
-  <field name="type">other</field>
-</record>
-<record id="account_610000" model="account.account.template">
-  <field name="code">610000</field>
-  <field name="name">Loyers et charges locatives</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_610"/>
-  <field name="type">other</field>
-</record>
-<record id="account_610100" model="account.account.template">
-  <field name="code">610100</field>
-  <field name="name">Redevances de crédit bail</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_610"/>
-  <field name="type">other</field>
-</record>
-<record id="account_611000" model="account.account.template">
-  <field name="code">611000</field>
-  <field name="name">Entretiens et réparations des locaux</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_61"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612000" model="account.account.template">
-  <field name="code">612000</field>
-  <field name="name">Consommation - eau</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6120"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612010" model="account.account.template">
-  <field name="code">612010</field>
-  <field name="name">Consommation - gaz</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6120"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612020" model="account.account.template">
-  <field name="code">612020</field>
-  <field name="name">Consommation  - électricité</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6120"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612030" model="account.account.template">
-  <field name="code">612030</field>
-  <field name="name">Consommation - carburants</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6120"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612040" model="account.account.template">
-  <field name="code">612040</field>
-  <field name="name">Consommation - mazout</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6120"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612100" model="account.account.template">
-  <field name="code">612100</field>
-  <field name="name">Documentation</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_612"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612200" model="account.account.template">
-  <field name="code">612200</field>
-  <field name="name">Imprimés et fournitures de bureau</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_612"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612300" model="account.account.template">
-  <field name="code">612300</field>
-  <field name="name">Téléphone</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6123"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612310" model="account.account.template">
-  <field name="code">612310</field>
-  <field name="name">Frais postaux</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6123"/>
-  <field name="type">other</field>
-</record>
-<record id="account_612320" model="account.account.template">
-  <field name="code">612320</field>
-  <field name="name">Fax</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6123"/>
-  <field name="type">other</field>
-</record>
-<record id="account_613000" model="account.account.template">
-  <field name="code">613000</field>
-  <field name="name">Redevances et royalties</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_613"/>
-  <field name="type">other</field>
-</record>
-<record id="account_613100" model="account.account.template">
-  <field name="code">613100</field>
-  <field name="name">Honoraires</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_613"/>
-  <field name="type">other</field>
-</record>
-<record id="account_613200" model="account.account.template">
-  <field name="code">613200</field>
-  <field name="name">Organismes de services</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_613"/>
-  <field name="type">other</field>
-</record>
-<record id="account_613300" model="account.account.template">
-  <field name="code">613300</field>
-  <field name="name">Commissions</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_613"/>
-  <field name="type">other</field>
-</record>
-<record id="account_614000" model="account.account.template">
-  <field name="code">614000</field>
-  <field name="name">Assurance incendie</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_61"/>
-  <field name="type">other</field>
-</record>
-<record id="account_615000" model="account.account.template">
-  <field name="code">615000</field>
-  <field name="name">Annonces, publicité</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_615"/>
-  <field name="type">other</field>
-</record>
-<record id="account_615100" model="account.account.template">
-  <field name="code">615100</field>
-  <field name="name">Cotisations et abonnements</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_615"/>
-  <field name="type">other</field>
-</record>
-<record id="account_615200" model="account.account.template">
-  <field name="code">615200</field>
-  <field name="name">Dons et libéralités</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_615"/>
-  <field name="type">other</field>
-</record>
-<record id="account_615300" model="account.account.template">
-  <field name="code">615300</field>
-  <field name="name">Publications légales</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_615"/>
-  <field name="type">other</field>
-</record>
-<record id="account_616000" model="account.account.template">
-  <field name="code">616000</field>
-  <field name="name">Sous-traitants</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_61"/>
-  <field name="type">other</field>
-</record>
-<record id="account_616100" model="account.account.template">
-  <field name="code">616100</field>
-  <field name="name">Transports par tiers</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_61"/>
-  <field name="type">other</field>
-</record>
-<record id="account_620000" model="account.account.template">
-  <field name="code">620000</field>
-  <field name="name">Rémunératons administrat. ou gérants</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_620"/>
-  <field name="type">other</field>
-</record>
-<record id="account_620100" model="account.account.template">
-  <field name="code">620100</field>
-  <field name="name">Rémunérations personnel de direction</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_620"/>
-  <field name="type">other</field>
-</record>
-<record id="account_620200" model="account.account.template">
-  <field name="code">620200</field>
-  <field name="name">Rémunérations employés</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_620"/>
-  <field name="type">other</field>
-</record>
-<record id="account_620300" model="account.account.template">
-  <field name="code">620300</field>
-  <field name="name">Rémunérations ouvriers</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_620"/>
-  <field name="type">other</field>
-</record>
-<record id="account_621000" model="account.account.template">
-  <field name="code">621000</field>
-  <field name="name">Chg.soc.lég.administ.et gérant</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_621"/>
-  <field name="type">other</field>
-</record>
-<record id="account_621100" model="account.account.template">
-  <field name="code">621100</field>
-  <field name="name">Chg.soc.lég. personnel de direction</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_621"/>
-  <field name="type">other</field>
-</record>
-<record id="account_621200" model="account.account.template">
-  <field name="code">621200</field>
-  <field name="name">Chg.soc.lég. employés</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_621"/>
-  <field name="type">other</field>
-</record>
-<record id="account_621300" model="account.account.template">
-  <field name="code">621300</field>
-  <field name="name">Chg.soc.lég. ouvriers</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_621"/>
-  <field name="type">other</field>
-</record>
-<record id="account_621400" model="account.account.template">
-  <field name="code">621400</field>
-  <field name="name">Assurance accidents</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_621"/>
-  <field name="type">other</field>
-</record>
-<record id="account_622000" model="account.account.template">
-  <field name="code">622000</field>
-  <field name="name">Primes patr. pour ass. extra - légales</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_62"/>
-  <field name="type">other</field>
-</record>
-<record id="account_623000" model="account.account.template">
-  <field name="code">623000</field>
-  <field name="name">Autres frais de personnel</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_62"/>
-  <field name="type">other</field>
-</record>
-<record id="account_624000" model="account.account.template">
-  <field name="code">624000</field>
-  <field name="name">Pension administrat. ou gérant</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_624"/>
-  <field name="type">other</field>
-</record>
-<record id="account_624100" model="account.account.template">
-  <field name="code">624100</field>
-  <field name="name">Pension personnel</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_624"/>
-  <field name="type">other</field>
-</record>
-<record id="account_630000" model="account.account.template">
-  <field name="code">630000</field>
-  <field name="name">Dot. cor. val s/frais d&apos;établissement</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_630"/>
-  <field name="type">other</field>
-</record>
-<record id="account_630100" model="account.account.template">
-  <field name="code">630100</field>
-  <field name="name">Dot. cor. val s/immob. incorporels</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_630"/>
-  <field name="type">other</field>
-</record>
-<record id="account_630200" model="account.account.template">
-  <field name="code">630200</field>
-  <field name="name">Dot. cor. val s/immob. corporels</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_630"/>
-  <field name="type">other</field>
-</record>
-<record id="account_631000" model="account.account.template">
-  <field name="code">631000</field>
-  <field name="name">Dot. cor. val s/stock mat.fourni</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_631"/>
-  <field name="type">other</field>
-</record>
-<record id="account_631100" model="account.account.template">
-  <field name="code">631100</field>
-  <field name="name">Reprises cor. val. s/stock mat. fourni</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_631"/>
-  <field name="type">other</field>
-</record>
-<record id="account_632000" model="account.account.template">
-  <field name="code">632000</field>
-  <field name="name">Dot. cor. val s/en-cours,pr fini</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_632"/>
-  <field name="type">other</field>
-</record>
-<record id="account_632100" model="account.account.template">
-  <field name="code">632100</field>
-  <field name="name">Reprises cor. val s/en-cours,pf</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_632"/>
-  <field name="type">other</field>
-</record>
-<record id="account_633000" model="account.account.template">
-  <field name="code">633000</field>
-  <field name="name">Dot. cor. val s/cr comm +1an</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_633"/>
-  <field name="type">other</field>
-</record>
-<record id="account_633100" model="account.account.template">
-  <field name="code">633100</field>
-  <field name="name">Reprises cor. val s/cr com +1an</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_633"/>
-  <field name="type">other</field>
-</record>
-<record id="account_634000" model="account.account.template">
-  <field name="code">634000</field>
-  <field name="name">Dot. cor. val. s/cr comm -1an</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_634"/>
-  <field name="type">other</field>
-</record>
-<record id="account_634100" model="account.account.template">
-  <field name="code">634100</field>
-  <field name="name">Reprises cor. val.s/cr com -1an</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_634"/>
-  <field name="type">other</field>
-</record>
-<record id="account_635000" model="account.account.template">
-  <field name="code">635000</field>
-  <field name="name">Dot. prov. pension et oblig. sim.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_635"/>
-  <field name="type">other</field>
-</record>
-<record id="account_635100" model="account.account.template">
-  <field name="code">635100</field>
-  <field name="name">Reprises prov. s/pens.obli. sim.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_635"/>
-  <field name="type">other</field>
-</record>
-<record id="account_636000" model="account.account.template">
-  <field name="code">636000</field>
-  <field name="name">Dot. prov-grosses réparation</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_636"/>
-  <field name="type">other</field>
-</record>
-<record id="account_636100" model="account.account.template">
-  <field name="code">636100</field>
-  <field name="name">Reprises prov. grosses réparation</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_636"/>
-  <field name="type">other</field>
-</record>
-<record id="account_637000" model="account.account.template">
-  <field name="code">637000</field>
-  <field name="name">Dot. prov-autres risques et chg</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_637"/>
-  <field name="type">other</field>
-</record>
-<record id="account_637100" model="account.account.template">
-  <field name="code">637100</field>
-  <field name="name">Reprises prov autres risq,chg</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_637"/>
-  <field name="type">other</field>
-</record>
-<record id="account_640000" model="account.account.template">
-  <field name="code">640000</field>
-  <field name="name">Taxe d&apos;abonnement</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_640"/>
-  <field name="type">other</field>
-</record>
-<record id="account_640100" model="account.account.template">
-  <field name="code">640100</field>
-  <field name="name">Impôt foncier</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_640"/>
-  <field name="type">other</field>
-</record>
-<record id="account_640200" model="account.account.template">
-  <field name="code">640200</field>
-  <field name="name">Impôt commercial s/le capital</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_640"/>
-  <field name="type">other</field>
-</record>
-<record id="account_640300" model="account.account.template">
-  <field name="code">640300</field>
-  <field name="name">Impôt s/la fortune</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_640"/>
-  <field name="type">other</field>
-</record>
-<record id="account_641000" model="account.account.template">
-  <field name="code">641000</field>
-  <field name="name">Moins-val. sur réalis. d&apos;immob. corp.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_64"/>
-  <field name="type">other</field>
-</record>
-<record id="account_642000" model="account.account.template">
-  <field name="code">642000</field>
-  <field name="name">Moins-val. / réalis. de créances comm.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_64"/>
-  <field name="type">other</field>
-</record>
-<record id="account_643000" model="account.account.template">
-  <field name="code">643000</field>
-  <field name="name">Charges d&apos;exploitation diverses</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_64"/>
-  <field name="type">other</field>
-</record>
-<record id="account_650000" model="account.account.template">
-  <field name="code">650000</field>
-  <field name="name">Intérêts, commissions et frais / dettes</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_65"/>
-  <field name="type">other</field>
-</record>
-<record id="account_651000" model="account.account.template">
-  <field name="code">651000</field>
-  <field name="name">Dot. cor. val s/actif circ</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_651"/>
-  <field name="type">other</field>
-</record>
-<record id="account_651100" model="account.account.template">
-  <field name="code">651100</field>
-  <field name="name">Reprises cor. val s/actif circulants</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_651"/>
-  <field name="type">other</field>
-</record>
-<record id="account_652000" model="account.account.template">
-  <field name="code">652000</field>
-  <field name="name">Moins-values sur réalis. d&apos;actifs circ.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_65"/>
-  <field name="type">other</field>
-</record>
-<record id="account_653000" model="account.account.template">
-  <field name="code">653000</field>
-  <field name="name">Charges d&apos;escompte de créances</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_65"/>
-  <field name="type">other</field>
-</record>
-<record id="account_654000" model="account.account.template">
-  <field name="code">654000</field>
-  <field name="name">Différences de change</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_65"/>
-  <field name="type">other</field>
-</record>
-<record id="account_655000" model="account.account.template">
-  <field name="code">655000</field>
-  <field name="name">Ecarts de conversion des devises</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_65"/>
-  <field name="type">other</field>
-</record>
-<record id="account_656000" model="account.account.template">
-  <field name="code">656000</field>
-  <field name="name">Frais de banque</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_65"/>
-  <field name="type">other</field>
-</record>
-<record id="account_660000" model="account.account.template">
-  <field name="code">660000</field>
-  <field name="name">Dot. cor. val exceptionnelles</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_660"/>
-  <field name="type">other</field>
-</record>
-<record id="account_660100" model="account.account.template">
-  <field name="code">660100</field>
-  <field name="name">Reprises cor. val. excep</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_660"/>
-  <field name="type">other</field>
-</record>
-<record id="account_661000" model="account.account.template">
-  <field name="code">661000</field>
-  <field name="name">Dot. cor. val s/immob. financières</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_661"/>
-  <field name="type">other</field>
-</record>
-<record id="account_661100" model="account.account.template">
-  <field name="code">661100</field>
-  <field name="name">Reprises cor val s/immob. fin.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_661"/>
-  <field name="type">other</field>
-</record>
-<record id="account_662000" model="account.account.template">
-  <field name="code">662000</field>
-  <field name="name">Dot. prov-risques et chg except.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_662"/>
-  <field name="type">other</field>
-</record>
-<record id="account_662100" model="account.account.template">
-  <field name="code">662100</field>
-  <field name="name">Reprises prov risq,chg except.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_662"/>
-  <field name="type">other</field>
-</record>
-<record id="account_663000" model="account.account.template">
-  <field name="code">663000</field>
-  <field name="name">Moins-values sur réalis. d&apos;actifs immob.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_66"/>
-  <field name="type">other</field>
-</record>
-<record id="account_665000" model="account.account.template">
-  <field name="code">665000</field>
-  <field name="name">Différences de change exceptionnelles</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_66"/>
-  <field name="type">other</field>
-</record>
-<record id="account_668000" model="account.account.template">
-  <field name="code">668000</field>
-  <field name="name">Autres charges exceptionnelles</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_66"/>
-  <field name="type">other</field>
-</record>
-<record id="account_670000" model="account.account.template">
-  <field name="code">670000</field>
-  <field name="name">Impôts luxemb sur le résultat de l&apos;ex.</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_67"/>
-  <field name="type">other</field>
-</record>
-<record id="account_671000" model="account.account.template">
-  <field name="code">671000</field>
-  <field name="name">Impôts luxemb /résultat d&apos;ex. antérieurs</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_67"/>
-  <field name="type">other</field>
-</record>
-<record id="account_672000" model="account.account.template">
-  <field name="code">672000</field>
-  <field name="name">Impôts étrangers sur le résultat de l&apos;ex</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_67"/>
-  <field name="type">other</field>
-</record>
-<record id="account_673000" model="account.account.template">
-  <field name="code">673000</field>
-  <field name="name">Impôts étrgs/résultat d&apos;ex. antérieurs</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_67"/>
-  <field name="type">other</field>
-</record>
-<record id="account_674000" model="account.account.template">
-  <field name="code">674000</field>
-  <field name="name">Impôts sur résultats exceptionnels</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_67"/>
-  <field name="type">other</field>
-</record>
-<record id="account_680000" model="account.account.template">
-  <field name="code">680000</field>
-  <field name="name">Transfert aux réserves immunisées</field>
-  <field name="user_type" ref="account_type_expense"/>
-
-  <field name="parent_id" ref="account_6"/>
-  <field name="type">other</field>
-</record>
-<record id="account_700000" model="account.account.template">
-  <field name="code">700000</field>
-  <field name="name">Ventes et prestations de services</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_70"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_708000" model="account.account.template">
-  <field name="code">708000</field>
-  <field name="name">R.r.r accordés sur ventes</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_70"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_712000" model="account.account.template">
-  <field name="code">712000</field>
-  <field name="name">Variation de stocks des encours de fabr.</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_71"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_713000" model="account.account.template">
-  <field name="code">713000</field>
-  <field name="name">Variation de stocks des produits finis</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_71"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_720000" model="account.account.template">
-  <field name="code">720000</field>
-  <field name="name">Travaux effect. par entreprise elle-même</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_7"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_740000" model="account.account.template">
-  <field name="code">740000</field>
-  <field name="name">Subsides d&apos;exploitation</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_74"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_741000" model="account.account.template">
-  <field name="code">741000</field>
-  <field name="name">Plus-values sur réal. d&apos;immob. corp.</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_74"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_742000" model="account.account.template">
-  <field name="code">742000</field>
-  <field name="name">Plus-values sur réalis. créances comm.</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_74"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_743000" model="account.account.template">
-  <field name="code">743000</field>
-  <field name="name">Récupération de frais de personnel</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_74"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_744000" model="account.account.template">
-  <field name="code">744000</field>
-  <field name="name">Commissions et courtages</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_74"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_745000" model="account.account.template">
-  <field name="code">745000</field>
-  <field name="name">Redevances pour brevets et licences</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_74"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_746000" model="account.account.template">
-  <field name="code">746000</field>
-  <field name="name">Loyers perçus</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_74"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_748000" model="account.account.template">
-  <field name="code">748000</field>
-  <field name="name">Produits d&apos;exploitation divers.</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_74"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_750000" model="account.account.template">
-  <field name="code">750000</field>
-  <field name="name">Produits des participations</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_750"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_750100" model="account.account.template">
-  <field name="code">750100</field>
-  <field name="name">Autres produits des immob. financières</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_750"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_751000" model="account.account.template">
-  <field name="code">751000</field>
-  <field name="name">Produits des valeurs mobilières</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_751"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_751100" model="account.account.template">
-  <field name="code">751100</field>
-  <field name="name">Autres produits des actifs circulants</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_751"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_752000" model="account.account.template">
-  <field name="code">752000</field>
-  <field name="name">Plus-values sur réalis. d&apos;actifs circula</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_753000" model="account.account.template">
-  <field name="code">753000</field>
-  <field name="name">Subsides en capital et en intérêts</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_754000" model="account.account.template">
-  <field name="code">754000</field>
-  <field name="name">Différences de change</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_754100" model="account.account.template">
-  <field name="code">754100</field>
-  <field name="name">Amendes pour retards de paiement</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_754200" model="account.account.template">
-  <field name="code">754200</field>
-  <field name="name">Intérêts retards de paiement</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_755000" model="account.account.template">
-  <field name="code">755000</field>
-  <field name="name">Ecarts de conversion de devises</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_756000" model="account.account.template">
-  <field name="code">756000</field>
-  <field name="name">Autres produits financiers</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_757000" model="account.account.template">
-  <field name="code">757000</field>
-  <field name="name">Escomptes obtenus</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_75"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_763000" model="account.account.template">
-  <field name="code">763000</field>
-  <field name="name">Plus-values sur réalis. d&apos;actifs immob.</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_7"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_771000" model="account.account.template">
-  <field name="code">771000</field>
-  <field name="name">Régularis. d&apos;impôts luxemb sur résultat</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_77"/>
-  <field name="type">payable</field>
-</record>
-<record id="account_773000" model="account.account.template">
-  <field name="code">773000</field>
-  <field name="name">Régularis. d&apos;impôts étrangers / résultat</field>
-  <field name="user_type" ref="account_type_income"/>
-
-  <field name="parent_id" ref="account_77"/>
-  <field name="type">payable</field>
-</record>
+		<record id="account_lu_0" model="account.account.template">
+		  <field name="code">0</field>
+		  <field name="name">Plan KLUWER</field>
+		  <field name="type" >view</field>
+		  <field name="user_type" ref="account_type_root"/>
+		</record>
+
+		<record id="account_1" model="account.account.template">
+		  <field name="code">1</field>
+		  <field name="name">Fonds propres, prov. &amp; dettes + d&apos;1an</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_lu_0"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_2" model="account.account.template">
+		  <field name="code">2</field>
+		  <field name="name">Immobilis., dettes &amp; créances à + d&apos;1 an</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_lu_0"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_3" model="account.account.template">
+		  <field name="code">3</field>
+		  <field name="name">Stocks et commandes en cours d&apos;exécution</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_lu_0"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_4" model="account.account.template">
+		  <field name="code">4</field>
+		  <field name="name">Créances et dettes à un an au plus</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_lu_0"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_5" model="account.account.template">
+		  <field name="code">5</field>
+		  <field name="name">Placements de trésorerie et disponible</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_lu_0"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_6" model="account.account.template">
+		  <field name="code">6</field>
+		  <field name="name">Charges</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_lu_0"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_7" model="account.account.template">
+		  <field name="code">7</field>
+		  <field name="name">Produits</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_lu_0"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_10" model="account.account.template">
+		  <field name="code">10</field>
+		  <field name="name">Capital</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_12" model="account.account.template">
+		  <field name="code">12</field>
+		  <field name="name">Plus-values de réévaluation</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_13" model="account.account.template">
+		  <field name="code">13</field>
+		  <field name="name">Réserves</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_14" model="account.account.template">
+		  <field name="code">14</field>
+		  <field name="name">Résultat reporté</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_15" model="account.account.template">
+		  <field name="code">15</field>
+		  <field name="name">Subsides en capital</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_16" model="account.account.template">
+		  <field name="code">16</field>
+		  <field name="name">Provisions et impôts différés</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_17" model="account.account.template">
+		  <field name="code">17</field>
+		  <field name="name">Dettes à plus d&apos;un an</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_20" model="account.account.template">
+		  <field name="code">20</field>
+		  <field name="name">Frais d&apos;établissement</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_21" model="account.account.template">
+		  <field name="code">21</field>
+		  <field name="name">Immobilisations incorporelles</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_22" model="account.account.template">
+		  <field name="code">22</field>
+		  <field name="name">Terrains et constructions</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_23" model="account.account.template">
+		  <field name="code">23</field>
+		  <field name="name">Installations, machines et outillages</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_24" model="account.account.template">
+		  <field name="code">24</field>
+		  <field name="name">Mobilier et matériel roulant</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_25" model="account.account.template">
+		  <field name="code">25</field>
+		  <field name="name">Immobilisation détenues en loc.-fin.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_27" model="account.account.template">
+		  <field name="code">27</field>
+		  <field name="name">Immobilis. corp. en cours &amp; acptes versé</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_28" model="account.account.template">
+		  <field name="code">28</field>
+		  <field name="name">Immobilisations financières</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_30" model="account.account.template">
+		  <field name="code">30</field>
+		  <field name="name">Approvisionnements - matières premières</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_3"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_31" model="account.account.template">
+		  <field name="code">31</field>
+		  <field name="name">Approvisionnements et fournitures</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_3"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_32" model="account.account.template">
+		  <field name="code">32</field>
+		  <field name="name">En cours de fabrication</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_3"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_33" model="account.account.template">
+		  <field name="code">33</field>
+		  <field name="name">Produits finis</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_3"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_34" model="account.account.template">
+		  <field name="code">34</field>
+		  <field name="name">Marchandises</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_3"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_36" model="account.account.template">
+		  <field name="code">36</field>
+		  <field name="name">Acomptes versés sur achats pour stocks</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_3"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_40" model="account.account.template">
+		  <field name="code">40</field>
+		  <field name="name">Créances commerciales</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_41" model="account.account.template">
+		  <field name="code">41</field>
+		  <field name="name">Autres créances à - d&apos;un an</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_42" model="account.account.template">
+		  <field name="code">42</field>
+		  <field name="name">Dettes à + d&apos;1 an échéant dans l&apos;année</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_43" model="account.account.template">
+		  <field name="code">43</field>
+		  <field name="name">Dettes financières</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_44" model="account.account.template">
+		  <field name="code">44</field>
+		  <field name="name">Dettes commerciales</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_45" model="account.account.template">
+		  <field name="code">45</field>
+		  <field name="name">Dettes fiscales, salariales et sociales</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_47" model="account.account.template">
+		  <field name="code">47</field>
+		  <field name="name">Dettes suite à l&apos;affect. des résultats</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_48" model="account.account.template">
+		  <field name="code">48</field>
+		  <field name="name">Dettes diverses</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_49" model="account.account.template">
+		  <field name="code">49</field>
+		  <field name="name">Comptes de régularisation et cptes d&apos;att</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_51" model="account.account.template">
+		  <field name="code">51</field>
+		  <field name="name">Actions et parts</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_52" model="account.account.template">
+		  <field name="code">52</field>
+		  <field name="name">Titres à revenu fixe</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_53" model="account.account.template">
+		  <field name="code">53</field>
+		  <field name="name">Dépôts à terme</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_55" model="account.account.template">
+		  <field name="code">55</field>
+		  <field name="name">Etablissements de crédit</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_56" model="account.account.template">
+		  <field name="code">56</field>
+		  <field name="name">Ccp</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_57" model="account.account.template">
+		  <field name="code">57</field>
+		  <field name="name">Caisses</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_60" model="account.account.template">
+		  <field name="code">60</field>
+		  <field name="name">Approvisionnements et marchandises</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_61" model="account.account.template">
+		  <field name="code">61</field>
+		  <field name="name">Services et biens divers</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_62" model="account.account.template">
+		  <field name="code">62</field>
+		  <field name="name">Rémunérations, charges soc. et pensions</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_64" model="account.account.template">
+		  <field name="code">64</field>
+		  <field name="name">Autres charges d&apos;exploitation</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_65" model="account.account.template">
+		  <field name="code">65</field>
+		  <field name="name">Charges financières</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_66" model="account.account.template">
+		  <field name="code">66</field>
+		  <field name="name">Charges exceptionnelles</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_67" model="account.account.template">
+		  <field name="code">67</field>
+		  <field name="name">Impôts sur le résultat</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_70" model="account.account.template">
+		  <field name="code">70</field>
+		  <field name="name">Chiffre d&apos;affaires</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_7"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_71" model="account.account.template">
+		  <field name="code">71</field>
+		  <field name="name">Variation des stocks &amp; comm. en cours</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_7"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_74" model="account.account.template">
+		  <field name="code">74</field>
+		  <field name="name">Autres produits d&apos;exploitation</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_7"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_75" model="account.account.template">
+		  <field name="code">75</field>
+		  <field name="name">Produits financiers</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_7"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_77" model="account.account.template">
+		  <field name="code">77</field>
+		  <field name="name">Régul. d&apos;impôts &amp; reprises prov. fisc.</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_7"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_140" model="account.account.template">
+		  <field name="code">140</field>
+		  <field name="name">Bénéfice reporté</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_14"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_175" model="account.account.template">
+		  <field name="code">175</field>
+		  <field name="name">Dettes commerciales</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_200" model="account.account.template">
+		  <field name="code">200</field>
+		  <field name="name">Frais de constitution et d&apos;augm. capital</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_20"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_201" model="account.account.template">
+		  <field name="code">201</field>
+		  <field name="name">Frais d&apos;augmentation de capital</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_20"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_202" model="account.account.template">
+		  <field name="code">202</field>
+		  <field name="name">Fr.d&apos;emission d&apos;empr,prime remboursement</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_20"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_203" model="account.account.template">
+		  <field name="code">203</field>
+		  <field name="name">Autres frais d&apos;établissement</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_20"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_204" model="account.account.template">
+		  <field name="code">204</field>
+		  <field name="name">Frais de restructuration</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_20"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_210" model="account.account.template">
+		  <field name="code">210</field>
+		  <field name="name">Frais de recherche et de développement</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_21"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_211" model="account.account.template">
+		  <field name="code">211</field>
+		  <field name="name">Concessions, brevets et licences</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_21"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_212" model="account.account.template">
+		  <field name="code">212</field>
+		  <field name="name">Fonds de commerce</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_21"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_220" model="account.account.template">
+		  <field name="code">220</field>
+		  <field name="name">Terrains</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_22"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_221" model="account.account.template">
+		  <field name="code">221</field>
+		  <field name="name">Constructions</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_22"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_222" model="account.account.template">
+		  <field name="code">222</field>
+		  <field name="name">Terrains bâtis</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_22"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_223" model="account.account.template">
+		  <field name="code">223</field>
+		  <field name="name">Autres droits réels sur des immeubles</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_22"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_230" model="account.account.template">
+		  <field name="code">230</field>
+		  <field name="name">Installations</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_23"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_231" model="account.account.template">
+		  <field name="code">231</field>
+		  <field name="name">Machines</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_23"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_240" model="account.account.template">
+		  <field name="code">240</field>
+		  <field name="name">Installation gen, agencements,..</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_24"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_241" model="account.account.template">
+		  <field name="code">241</field>
+		  <field name="name">Mobilier</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_24"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_242" model="account.account.template">
+		  <field name="code">242</field>
+		  <field name="name">Matériel roulant</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_24"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_280" model="account.account.template">
+		  <field name="code">280</field>
+		  <field name="name">Participation dans des entreprises liées</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_28"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_281" model="account.account.template">
+		  <field name="code">281</field>
+		  <field name="name">Créances sur des entreprises liées</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_28"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_282" model="account.account.template">
+		  <field name="code">282</field>
+		  <field name="name">Participations entr. avec lien particip.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_28"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_283" model="account.account.template">
+		  <field name="code">283</field>
+		  <field name="name">Créances / entrepr. avec lien particip.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_28"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_290" model="account.account.template">
+		  <field name="code">290</field>
+		  <field name="name">Créances commerciales</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_291" model="account.account.template">
+		  <field name="code">291</field>
+		  <field name="name">Autres créances</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_411" model="account.account.template">
+		  <field name="code">411</field>
+		  <field name="name">T.v.a en amont</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_425" model="account.account.template">
+		  <field name="code">425</field>
+		  <field name="name">Dettes commerciales échéant ds l&apos;année</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_451" model="account.account.template">
+		  <field name="code">451</field>
+		  <field name="name">T.v.a. en aval</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_45"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_452" model="account.account.template">
+		  <field name="code">452</field>
+		  <field name="name">Impôts et taxes à payer</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_45"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_512" model="account.account.template">
+		  <field name="code">512</field>
+		  <field name="name">Actions &amp; parts - options acquises</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_51"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_550" model="account.account.template">
+		  <field name="code">550</field>
+		  <field name="name">Comptes courants bancaires</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_55"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_609" model="account.account.template">
+		  <field name="code">609</field>
+		  <field name="name">Variation des stocks</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_60"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_610" model="account.account.template">
+		  <field name="code">610</field>
+		  <field name="name">Loyers et charges locatives</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_61"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_612" model="account.account.template">
+		  <field name="code">612</field>
+		  <field name="name">Fournitures faites à l&apos;entreprise</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_61"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_613" model="account.account.template">
+		  <field name="code">613</field>
+		  <field name="name">Rétributions de tiers</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_61"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_615" model="account.account.template">
+		  <field name="code">615</field>
+		  <field name="name">publicités</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_61"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_620" model="account.account.template">
+		  <field name="code">620</field>
+		  <field name="name">Rémunérations et avantages soc. directs</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_62"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_621" model="account.account.template">
+		  <field name="code">621</field>
+		  <field name="name">Charges sociales</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_62"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_624" model="account.account.template">
+		  <field name="code">624</field>
+		  <field name="name">Pensions</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_62"/>
+		</record>
+		<record id="account_630" model="account.account.template">
+		  <field name="code">630</field>
+		  <field name="name">Dotations aux corrections de val./immob.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_631" model="account.account.template">
+		  <field name="code">631</field>
+		  <field name="name">Dotations aux correct. de val./stocks</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_632" model="account.account.template">
+		  <field name="code">632</field>
+		  <field name="name">Dot. cor. val s/en-cours,pr fini</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_633" model="account.account.template">
+		  <field name="code">633</field>
+		  <field name="name">Dotations correct. val./cr. comm. +1an</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_634" model="account.account.template">
+		  <field name="code">634</field>
+		  <field name="name">Dotations correct. val./cr. comm. -1an</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_635" model="account.account.template">
+		  <field name="code">635</field>
+		  <field name="name">Provisions pour pensions et oblig. sim.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_636" model="account.account.template">
+		  <field name="code">636</field>
+		  <field name="name">Provisions pour grosses réparations</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_637" model="account.account.template">
+		  <field name="code">637</field>
+		  <field name="name">Provisions pour autres risques &amp; charges</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_640" model="account.account.template">
+		  <field name="code">640</field>
+		  <field name="name">Taxes et impôts directs</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_64"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_651" model="account.account.template">
+		  <field name="code">651</field>
+		  <field name="name">Réductions de valeur / actifs circulants</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_65"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_660" model="account.account.template">
+		  <field name="code">660</field>
+		  <field name="name">Dotations aux corrections de val. except</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_66"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_661" model="account.account.template">
+		  <field name="code">661</field>
+		  <field name="name">Dotations aux corrections de val./financ</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_66"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_662" model="account.account.template">
+		  <field name="code">662</field>
+		  <field name="name">Provisions pour risques &amp; charges except</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_66"/>
+		  <field name="type" >view</field>
+		</record>
+		<record id="account_750" model="account.account.template">
+		  <field name="code">750</field>
+		  <field name="name">Produits des immob. financières</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_751" model="account.account.template">
+		  <field name="code">751</field>
+		  <field name="name">Produits des actifs circulants</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_1750" model="account.account.template">
+		  <field name="code">1750</field>
+		  <field name="name">Fournisseurs - dettes en compte</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_175"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_1751" model="account.account.template">
+		  <field name="code">1751</field>
+		  <field name="name">Effets à payer</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_175"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_6120" model="account.account.template">
+		  <field name="code">6120</field>
+		  <field name="name">Eau, gaz, électricité, carburants</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_612"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_6123" model="account.account.template">
+		  <field name="code">6123</field>
+		  <field name="name">Téléphone, télégrammes, frais post.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_612"/>
+		  <field name="type">view</field>
+		</record>
+		<record id="account_100000" model="account.account.template">
+		  <field name="code">100000</field>
+		  <field name="name">Capital souscrit</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_10"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_101000" model="account.account.template">
+		  <field name="code">101000</field>
+		  <field name="name">Capital non appelé (-)</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_10"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_109000" model="account.account.template">
+		  <field name="code">109000</field>
+		  <field name="name">Compte de l&apos;exploitant</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_10"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_110000" model="account.account.template">
+		  <field name="code">110000</field>
+		  <field name="name">Primes d&apos;émission</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_120000" model="account.account.template">
+		  <field name="code">120000</field>
+		  <field name="name">Plus-values de rééval. sur immob. incorp</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_12"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_121000" model="account.account.template">
+		  <field name="code">121000</field>
+		  <field name="name">Plus-values de rééval. sur immob. corp.</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_12"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_122000" model="account.account.template">
+		  <field name="code">122000</field>
+		  <field name="name">Plus-values de rééval. sur immob. fin.</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_12"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_123000" model="account.account.template">
+		  <field name="code">123000</field>
+		  <field name="name">Plus-values de réévaluation sur stocks</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_12"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_124000" model="account.account.template">
+		  <field name="code">124000</field>
+		  <field name="name">Reprises de réd. de val./plac. de très.</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_12"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_130000" model="account.account.template">
+		  <field name="code">130000</field>
+		  <field name="name">Réserve légale</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_13"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_131000" model="account.account.template">
+		  <field name="code">131000</field>
+		  <field name="name">Réserves indisponibles</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_13"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_132000" model="account.account.template">
+		  <field name="code">132000</field>
+		  <field name="name">Réserves immunisées</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_13"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_133000" model="account.account.template">
+		  <field name="code">133000</field>
+		  <field name="name">Réserves disponibles</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_13"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_134000" model="account.account.template">
+		  <field name="code">134000</field>
+		  <field name="name">Autres reserves</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_13"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_140000" model="account.account.template">
+		  <field name="code">140000</field>
+		  <field name="name">Résultats reportés</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_140"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_140100" model="account.account.template">
+		  <field name="code">140100</field>
+		  <field name="name">Bénéfice de l&apos;exercice</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_140"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_140200" model="account.account.template">
+		  <field name="code">140200</field>
+		  <field name="name">Perte de l&apos;exercice</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_140"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_141000" model="account.account.template">
+		  <field name="code">141000</field>
+		  <field name="name">Perte reportée</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_14"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_150000" model="account.account.template">
+		  <field name="code">150000</field>
+		  <field name="name">Subsides en cap. - montants obtenus</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_15"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_151000" model="account.account.template">
+		  <field name="code">151000</field>
+		  <field name="name">Subsides-montants transf. aux résultats</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_15"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_160000" model="account.account.template">
+		  <field name="code">160000</field>
+		  <field name="name">Provisions pour pensions</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_161000" model="account.account.template">
+		  <field name="code">161000</field>
+		  <field name="name">Provisions pour charges fiscales</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_162000" model="account.account.template">
+		  <field name="code">162000</field>
+		  <field name="name">Provisions pr grosses rép. &amp; gros entr.</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_163000" model="account.account.template">
+		  <field name="code">163000</field>
+		  <field name="name">Provisions pour rente viagère</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_164000" model="account.account.template">
+		  <field name="code">164000</field>
+		  <field name="name">Provisions pr sûretés pers. et réelles</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_165000" model="account.account.template">
+		  <field name="code">165000</field>
+		  <field name="name">Provisions diverses</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_165400" model="account.account.template">
+		  <field name="code">165400</field>
+		  <field name="name">Provisions pour autres risques &amp; charges</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_166000" model="account.account.template">
+		  <field name="code">166000</field>
+		  <field name="name">Provisions pour charges de commandes</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_168000" model="account.account.template">
+		  <field name="code">168000</field>
+		  <field name="name">Impôts différés</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_169000" model="account.account.template">
+		  <field name="code">169000</field>
+		  <field name="name">Autres provisions</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_16"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_170000" model="account.account.template">
+		  <field name="code">170000</field>
+		  <field name="name">Emprunts convertibles</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_171000" model="account.account.template">
+		  <field name="code">171000</field>
+		  <field name="name">Emprunts obligataires non convertibles</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_172000" model="account.account.template">
+		  <field name="code">172000</field>
+		  <field name="name">Dettes de loc. - financ. et assimilées</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_173000" model="account.account.template">
+		  <field name="code">173000</field>
+		  <field name="name">Etablissements de crédit</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_174000" model="account.account.template">
+		  <field name="code">174000</field>
+		  <field name="name">Autres emprunts</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_175000" model="account.account.template">
+		  <field name="code">175000</field>
+		  <field name="name">Fournisseurs - entreprises apparentées</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1750"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_175010" model="account.account.template">
+		  <field name="code">175010</field>
+		  <field name="name">Dettes en cpte  - fourniss. ordinaires</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1750"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_175100" model="account.account.template">
+		  <field name="code">175100</field>
+		  <field name="name">Effets à payer - entreprises apparentées</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1751"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_175110" model="account.account.template">
+		  <field name="code">175110</field>
+		  <field name="name">Effets à payer - fournisseurs ordinaires</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_1751"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_176000" model="account.account.template">
+		  <field name="code">176000</field>
+		  <field name="name">Acomptes reçus sur commandes</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_177100" model="account.account.template">
+		  <field name="code">177100</field>
+		  <field name="name">Entreprises liées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_177200" model="account.account.template">
+		  <field name="code">177200</field>
+		  <field name="name">Lien de participation</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_178000" model="account.account.template">
+		  <field name="code">178000</field>
+		  <field name="name">Cautionnements reçus en numéraire</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_179000" model="account.account.template">
+		  <field name="code">179000</field>
+		  <field name="name">Dettes diverses</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_17"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_180000" model="account.account.template">
+		  <field name="code">180000</field>
+		  <field name="name">Comptes de liaison établiss. &amp; succurs.</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_1"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_200000" model="account.account.template">
+		  <field name="code">200000</field>
+		  <field name="name">Frais de constitution</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_200"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_200900" model="account.account.template">
+		  <field name="code">200900</field>
+		  <field name="name">Amort s/fr de constitution</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_200"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_201000" model="account.account.template">
+		  <field name="code">201000</field>
+		  <field name="name">Frais d&apos;augmentation de capital</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_201"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_201900" model="account.account.template">
+		  <field name="code">201900</field>
+		  <field name="name">Amort s/fr d&apos;augmentation du capital</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_201"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_202000" model="account.account.template">
+		  <field name="code">202000</field>
+		  <field name="name">Fr.d&apos;emission d&apos;empr,prime remboursement</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_202"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_202900" model="account.account.template">
+		  <field name="code">202900</field>
+		  <field name="name">Amort s/fr d&apos;émission d&apos;emprunts</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_202"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_203000" model="account.account.template">
+		  <field name="code">203000</field>
+		  <field name="name">Autres frais d&apos;établissement</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_203"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_203900" model="account.account.template">
+		  <field name="code">203900</field>
+		  <field name="name">Amort s/autres fr d&apos;établissement</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_203"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_204000" model="account.account.template">
+		  <field name="code">204000</field>
+		  <field name="name">Frais de restructuration</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_204"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_204900" model="account.account.template">
+		  <field name="code">204900</field>
+		  <field name="name">Amort s/fr de restructuration</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_204"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_210000" model="account.account.template">
+		  <field name="code">210000</field>
+		  <field name="name">Frais de recherche et développement</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_210"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_210900" model="account.account.template">
+		  <field name="code">210900</field>
+		  <field name="name">Amort. s/fr de recherche et développemen</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_210"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_211100" model="account.account.template">
+		  <field name="code">211100</field>
+		  <field name="name">Concessions, brevet à titre onéreux</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_211"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_211190" model="account.account.template">
+		  <field name="code">211190</field>
+		  <field name="name">Amort. s/concession, brevet acquis</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_211"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_211200" model="account.account.template">
+		  <field name="code">211200</field>
+		  <field name="name">Conc., brevets créés par l&apos;entr. même</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_211"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_211290" model="account.account.template">
+		  <field name="code">211290</field>
+		  <field name="name">Amort. s/concession, brevets créés</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_211"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_212000" model="account.account.template">
+		  <field name="code">212000</field>
+		  <field name="name">Fonds de commerce</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_212"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_212900" model="account.account.template">
+		  <field name="code">212900</field>
+		  <field name="name">Amort s/fonds de commerce</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_212"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_213000" model="account.account.template">
+		  <field name="code">213000</field>
+		  <field name="name">Acomptes versés s/immob. incorp</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_21"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_214000" model="account.account.template">
+		  <field name="code">214000</field>
+		  <field name="name">Surprix afférent à l&apos;acquisit. d&apos;1 part.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_21"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_220000" model="account.account.template">
+		  <field name="code">220000</field>
+		  <field name="name">Terrains</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_220"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_220800" model="account.account.template">
+		  <field name="code">220800</field>
+		  <field name="name">Plus-values actées sur terrains</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_220"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_220900" model="account.account.template">
+		  <field name="code">220900</field>
+		  <field name="name">Réduction de valeur sur terrains</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_220"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_221800" model="account.account.template">
+		  <field name="code">221800</field>
+		  <field name="name">Plus-values actées sur constructions</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_221"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_221900" model="account.account.template">
+		  <field name="code">221900</field>
+		  <field name="name">Amort. sur constructions</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_221"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_222800" model="account.account.template">
+		  <field name="code">222800</field>
+		  <field name="name">Plus-values actées s/terrains bâtis</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_222"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_222900" model="account.account.template">
+		  <field name="code">222900</field>
+		  <field name="name">Amort. sur terrains bâtis</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_222"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_223800" model="account.account.template">
+		  <field name="code">223800</field>
+		  <field name="name">+values actées s/autres droits</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_223"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_223900" model="account.account.template">
+		  <field name="code">223900</field>
+		  <field name="name">Amort s/autres droits réels</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_223"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_230000" model="account.account.template">
+		  <field name="code">230000</field>
+		  <field name="name">Installations techniques</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_230"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_230900" model="account.account.template">
+		  <field name="code">230900</field>
+		  <field name="name">Amort s/installations techniques</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_230"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_231000" model="account.account.template">
+		  <field name="code">231000</field>
+		  <field name="name">Machines</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_231"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_231900" model="account.account.template">
+		  <field name="code">231900</field>
+		  <field name="name">Amortissement s/machines</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_231"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_232000" model="account.account.template">
+		  <field name="code">232000</field>
+		  <field name="name">Outillage</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_23"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_233000" model="account.account.template">
+		  <field name="code">233000</field>
+		  <field name="name">Pièces de rechange</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_23"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_238000" model="account.account.template">
+		  <field name="code">238000</field>
+		  <field name="name">Plus-values actées sur i./m./o.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_23"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_239000" model="account.account.template">
+		  <field name="code">239000</field>
+		  <field name="name">Amortissements sur i./m./o.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_23"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_240000" model="account.account.template">
+		  <field name="code">240000</field>
+		  <field name="name">Installation gen, agencements,..</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_240"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_240900" model="account.account.template">
+		  <field name="code">240900</field>
+		  <field name="name">Amort s/autres installations,outillage</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_240"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_241000" model="account.account.template">
+		  <field name="code">241000</field>
+		  <field name="name">Mobilier</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_241"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_241900" model="account.account.template">
+		  <field name="code">241900</field>
+		  <field name="name">Amort. sur mobilier</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_241"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_242000" model="account.account.template">
+		  <field name="code">242000</field>
+		  <field name="name">Matériel roulant</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_242"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_242900" model="account.account.template">
+		  <field name="code">242900</field>
+		  <field name="name">Amort. s/matériel roulant</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_242"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_243000" model="account.account.template">
+		  <field name="code">243000</field>
+		  <field name="name">Matériel de bureau</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_24"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_243900" model="account.account.template">
+		  <field name="code">243900</field>
+		  <field name="name">Amort. s/matériel de bureau</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_24"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_250000" model="account.account.template">
+		  <field name="code">250000</field>
+		  <field name="name">Terrains et constructions en loc.-fin.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_25"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_251000" model="account.account.template">
+		  <field name="code">251000</field>
+		  <field name="name">Install., machines &amp; out. en loc.-fin.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_25"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_252000" model="account.account.template">
+		  <field name="code">252000</field>
+		  <field name="name">Mobilier et mat. roulant en loc.-fin.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_25"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_260000" model="account.account.template">
+		  <field name="code">260000</field>
+		  <field name="name">Autres immobilisations corporelles</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_2"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_270000" model="account.account.template">
+		  <field name="code">270000</field>
+		  <field name="name">Immobilisations en cours</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_27"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_271000" model="account.account.template">
+		  <field name="code">271000</field>
+		  <field name="name">Avances &amp; acptes versés / immob.en cours</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_27"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_280000" model="account.account.template">
+		  <field name="code">280000</field>
+		  <field name="name">Parts dans des entreprises  liées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_280"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_280100" model="account.account.template">
+		  <field name="code">280100</field>
+		  <field name="name">Montants non appelés</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_280"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_280800" model="account.account.template">
+		  <field name="code">280800</field>
+		  <field name="name">+values actées s/parts entreprises liées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_280"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_280900" model="account.account.template">
+		  <field name="code">280900</field>
+		  <field name="name">Réduction de valeur s/parts</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_280"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_281000" model="account.account.template">
+		  <field name="code">281000</field>
+		  <field name="name">Créances s/des entreprises liées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_281"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_281100" model="account.account.template">
+		  <field name="code">281100</field>
+		  <field name="name">Effets à recevoir</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_281"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_281700" model="account.account.template">
+		  <field name="code">281700</field>
+		  <field name="name">Créances douteuses (entreprises liées)</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_281"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_281900" model="account.account.template">
+		  <field name="code">281900</field>
+		  <field name="name">Réduction de valeur s/cré. entre. liées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_281"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_282000" model="account.account.template">
+		  <field name="code">282000</field>
+		  <field name="name">Participations</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_282"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_282100" model="account.account.template">
+		  <field name="code">282100</field>
+		  <field name="name">Montants non appelés</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_282"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_282800" model="account.account.template">
+		  <field name="code">282800</field>
+		  <field name="name">+values actées s/participations</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_282"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_282900" model="account.account.template">
+		  <field name="code">282900</field>
+		  <field name="name">Réduction de valeur s/participations</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_282"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_283000" model="account.account.template">
+		  <field name="code">283000</field>
+		  <field name="name">Créances s/entrepr. lien de particip.</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_283"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_283100" model="account.account.template">
+		  <field name="code">283100</field>
+		  <field name="name">Effets à recevoir</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_283"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_283200" model="account.account.template">
+		  <field name="code">283200</field>
+		  <field name="name">Titres à revenu fixe</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_283"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_283700" model="account.account.template">
+		  <field name="code">283700</field>
+		  <field name="name">Créances douteuses (s/participations)</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_283"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_283900" model="account.account.template">
+		  <field name="code">283900</field>
+		  <field name="name">Réductions de valeur s/cr particip.</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_283"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_284000" model="account.account.template">
+		  <field name="code">284000</field>
+		  <field name="name">Titres à caractère d&apos;immobilisation</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_28"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_285000" model="account.account.template">
+		  <field name="code">285000</field>
+		  <field name="name">Autres prêts</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_28"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_286000" model="account.account.template">
+		  <field name="code">286000</field>
+		  <field name="name">Actions ou parts propres</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_28"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_288000" model="account.account.template">
+		  <field name="code">288000</field>
+		  <field name="name">Cautionnements versés en numéraire</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_28"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_290000" model="account.account.template">
+		  <field name="code">290000</field>
+		  <field name="name">Créances commerciales</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_290"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_290100" model="account.account.template">
+		  <field name="code">290100</field>
+		  <field name="name">Effets à recevoir</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_290"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_290600" model="account.account.template">
+		  <field name="code">290600</field>
+		  <field name="name">Acomptes versés</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_290"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_290700" model="account.account.template">
+		  <field name="code">290700</field>
+		  <field name="name">Créances douteuses s/cr commerciales</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_290"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_290900" model="account.account.template">
+		  <field name="code">290900</field>
+		  <field name="name">Réduction de valeur s/cr commerciales</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_290"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_291000" model="account.account.template">
+		  <field name="code">291000</field>
+		  <field name="name">Autres créances</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_291"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_291100" model="account.account.template">
+		  <field name="code">291100</field>
+		  <field name="name">Effets à recevoir</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_291"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_291700" model="account.account.template">
+		  <field name="code">291700</field>
+		  <field name="name">Créances douteuses s/autres créances</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_291"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_291900" model="account.account.template">
+		  <field name="code">291900</field>
+		  <field name="name">Réduction de valeur s/autres créances</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_291"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_300000" model="account.account.template">
+		  <field name="code">300000</field>
+		  <field name="name">Stocks matières premières val. d&apos;acquis.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_30"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_309000" model="account.account.template">
+		  <field name="code">309000</field>
+		  <field name="name">Réduction de valeur s/mat. premières</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_30"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_310000" model="account.account.template">
+		  <field name="code">310000</field>
+		  <field name="name">Matières consommables</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_31"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_310600" model="account.account.template">
+		  <field name="code">310600</field>
+		  <field name="name">Emballages commerciaux</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_31"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_319000" model="account.account.template">
+		  <field name="code">319000</field>
+		  <field name="name">Réd. de val. - stocks fournitures (-)</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_31"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_320000" model="account.account.template">
+		  <field name="code">320000</field>
+		  <field name="name">En cours de fabrication - val. d&apos;acquis.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_32"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_329000" model="account.account.template">
+		  <field name="code">329000</field>
+		  <field name="name">Réductions de valeur / en cours (-)</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_32"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_330000" model="account.account.template">
+		  <field name="code">330000</field>
+		  <field name="name">Valeur d&apos;acquisition des produits finis</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_33"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_339000" model="account.account.template">
+		  <field name="code">339000</field>
+		  <field name="name">Réduction de val. / produits finis (-)</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_33"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_340000" model="account.account.template">
+		  <field name="code">340000</field>
+		  <field name="name">Stocks marchandises - valeur d&apos;acquis.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_34"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_349000" model="account.account.template">
+		  <field name="code">349000</field>
+		  <field name="name">Réd. de val. / stocks marchandises (-)</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_34"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_360000" model="account.account.template">
+		  <field name="code">360000</field>
+		  <field name="name">Acomptes versés / achats pour stocks</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_36"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_369000" model="account.account.template">
+		  <field name="code">369000</field>
+		  <field name="name">Réd. de val. / acptes versés stocks (-)</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_36"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_400000" model="account.account.template">
+		  <field name="code">400000</field>
+		  <field name="name">Clients</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_40"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_401000" model="account.account.template">
+		  <field name="code">401000</field>
+		  <field name="name">Effets à recevoir - clients</field>
+		  <field name="user_type" ref="account_type_asset"/>
+		  <field name="reconcile">True</field>
+
+		  <field name="parent_id" ref="account_40"/>
+		  <field name="type">receivable</field>
+
+		</record>
+		<record id="account_403000" model="account.account.template">
+		  <field name="code">403000</field>
+		  <field name="name">Créances s/entreprises apparentées</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_40"/>
+		  <field name="type">receivable</field>
+		</record>
+		<record id="account_404000" model="account.account.template">
+		  <field name="code">404000</field>
+		  <field name="name">Produits à recevoir (factures à établir)</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_40"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_406000" model="account.account.template">
+		  <field name="code">406000</field>
+		  <field name="name">Acomptes versés aux fournisseurs</field>
+		  <field name="user_type" ref="account_type_creances"/>
+
+		  <field name="parent_id" ref="account_40"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_407000" model="account.account.template">
+		  <field name="code">407000</field>
+		  <field name="name">Créances commerciales douteuses</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_40"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_408000" model="account.account.template">
+		  <field name="code">408000</field>
+		  <field name="name">Ecarts de conversion de devises/créances</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_40"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_409000" model="account.account.template">
+		  <field name="code">409000</field>
+		  <field name="name">Réductions de valeur / créances comm.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_40"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_410000" model="account.account.template">
+		  <field name="code">410000</field>
+		  <field name="name">Capital appelé, non versé</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_411000" model="account.account.template">
+		  <field name="code">411000</field>
+		  <field name="name">T.v.a en amont</field>
+		  <field name="user_type" ref="account_type_asset"/>
+		  <field name="reconcile">True</field>
+		  <field name="parent_id" ref="account_411"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_411100" model="account.account.template">
+		  <field name="code">411100</field>
+		  <field name="name">T.v.a soumise à l&apos;origine amont</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_411"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_411500" model="account.account.template">
+		  <field name="code">411500</field>
+		  <field name="name">Compte courant tva</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_411"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_412000" model="account.account.template">
+		  <field name="code">412000</field>
+		  <field name="name">Impots et vers. fiscaux à récupérer</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_413100" model="account.account.template">
+		  <field name="code">413100</field>
+		  <field name="name">Autres créances sur entrepr. liées</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_413200" model="account.account.template">
+		  <field name="code">413200</field>
+		  <field name="name">Autres créances / entrepr. apparentées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_414000" model="account.account.template">
+		  <field name="code">414000</field>
+		  <field name="name">Produits à recevoir (non commerciaux)</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_416000" model="account.account.template">
+		  <field name="code">416000</field>
+		  <field name="name">Créances diverses</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_417000" model="account.account.template">
+		  <field name="code">417000</field>
+		  <field name="name">Créances douteuses</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_418000" model="account.account.template">
+		  <field name="code">418000</field>
+		  <field name="name">Cautionnements versés en numéraire</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_419000" model="account.account.template">
+		  <field name="code">419000</field>
+		  <field name="name">Réductions de val. / autres créances (-)</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_41"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_420000" model="account.account.template">
+		  <field name="code">420000</field>
+		  <field name="name">Emprunts obligataires convert.</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_421000" model="account.account.template">
+		  <field name="code">421000</field>
+		  <field name="name">Emprunts oblig. non convertibles</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_422000" model="account.account.template">
+		  <field name="code">422000</field>
+		  <field name="name">Dettes de location-financ. et assimilées</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_423000" model="account.account.template">
+		  <field name="code">423000</field>
+		  <field name="name">Etablissements de crédit</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_424000" model="account.account.template">
+		  <field name="code">424000</field>
+		  <field name="name">Autres emprunts</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_425000" model="account.account.template">
+		  <field name="code">425000</field>
+		  <field name="name">Fournisseurs</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_425"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_425100" model="account.account.template">
+		  <field name="code">425100</field>
+		  <field name="name">Effets à payer</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_425"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_426000" model="account.account.template">
+		  <field name="code">426000</field>
+		  <field name="name">Acomptes reçus / commandes éch. ds l&apos;an</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_427100" model="account.account.template">
+		  <field name="code">427100</field>
+		  <field name="name">Entreprises liées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_427200" model="account.account.template">
+		  <field name="code">427200</field>
+		  <field name="name">Lien de participation</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_428000" model="account.account.template">
+		  <field name="code">428000</field>
+		  <field name="name">Cautionnements reçus en numéraire</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_429000" model="account.account.template">
+		  <field name="code">429000</field>
+		  <field name="name">Dettes diverses échéant dans l&apos;année</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_42"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_430000" model="account.account.template">
+		  <field name="code">430000</field>
+		  <field name="name">Banques-emprunts en compte à terme fixe</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_43"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_431000" model="account.account.template">
+		  <field name="code">431000</field>
+		  <field name="name">Banques-promesses</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_43"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_432000" model="account.account.template">
+		  <field name="code">432000</field>
+		  <field name="name">Banques-crédit d&apos;acceptation</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_43"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_433000" model="account.account.template">
+		  <field name="code">433000</field>
+		  <field name="name">Banques-dettes en compte courant</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_43"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_438000" model="account.account.template">
+		  <field name="code">438000</field>
+		  <field name="name">Autres emprunts</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_43"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_440000" model="account.account.template">
+		  <field name="code">440000</field>
+		  <field name="name">Fournisseurs</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_44"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_441000" model="account.account.template">
+		  <field name="code">441000</field>
+		  <field name="name">Effets à payer</field>
+		  <field name="user_type" ref="account_type_liability"/>
+		  <field name="reconcile">True</field>
+
+		  <field name="parent_id" ref="account_44"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_442000" model="account.account.template">
+		  <field name="code">442000</field>
+		  <field name="name">Factures à recevoir</field>
+		  <field name="user_type" ref="account_type_root"/>
+		  <field name="reconcile">True</field>
+
+		  <field name="parent_id" ref="account_44"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_443100" model="account.account.template">
+		  <field name="code">443100</field>
+		  <field name="name">Entreprises liées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_44"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_443200" model="account.account.template">
+		  <field name="code">443200</field>
+		  <field name="name">Lien de participation</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_44"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_450000" model="account.account.template">
+		  <field name="code">450000</field>
+		  <field name="name">Dettes fiscales estimées</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_45"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_451000" model="account.account.template">
+		  <field name="code">451000</field>
+		  <field name="name">T.v.a en aval</field>
+		  <field name="user_type" ref="account_type_liability"/>
+		  <field name="reconcile">True</field>
+
+		  <field name="parent_id" ref="account_451"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_451100" model="account.account.template">
+		  <field name="code">451100</field>
+		  <field name="name">T.v.a soumise à l&apos;origine aval</field>
+		  <field name="user_type" ref="account_type_root"/>
+		  <field name="reconcile">True</field>
+
+		  <field name="parent_id" ref="account_451"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_451200" model="account.account.template">
+		  <field name="code">451200</field>
+		  <field name="name">T.v.a intracom</field>
+		  <field name="user_type" ref="account_type_root"/>
+		  <field name="reconcile">True</field>
+
+		  <field name="parent_id" ref="account_451"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_451500" model="account.account.template">
+		  <field name="code">451500</field>
+		  <field name="name">Compte courant tva</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_451"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_452000" model="account.account.template">
+		  <field name="code">452000</field>
+		  <field name="name">Impôts et taxes à payer à l&apos;état</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_452"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_452100" model="account.account.template">
+		  <field name="code">452100</field>
+		  <field name="name">Impôts et taxes à payer aux adm commun</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_452"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_453000" model="account.account.template">
+		  <field name="code">453000</field>
+		  <field name="name">Retenues s/salaires</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_45"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_454000" model="account.account.template">
+		  <field name="code">454000</field>
+		  <field name="name">Cass (centre..de sécurite soc)</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_45"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_455000" model="account.account.template">
+		  <field name="code">455000</field>
+		  <field name="name">Personnel-rémuneration à payer</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_45"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_456000" model="account.account.template">
+		  <field name="code">456000</field>
+		  <field name="name">Personnel-avances et acomptes</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_45"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_458000" model="account.account.template">
+		  <field name="code">458000</field>
+		  <field name="name">Autres dettes sociales</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_45"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_460000" model="account.account.template">
+		  <field name="code">460000</field>
+		  <field name="name">Acomptes reçus sur commandes</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_4"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_470000" model="account.account.template">
+		  <field name="code">470000</field>
+		  <field name="name">Dividendes-tantièmes d&apos;ex. ant. à payer</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_47"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_471000" model="account.account.template">
+		  <field name="code">471000</field>
+		  <field name="name">Dividendes de l&apos;exercice à payer</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_47"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_472000" model="account.account.template">
+		  <field name="code">472000</field>
+		  <field name="name">Tantièmes de l&apos;exercice à payer</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_47"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_473000" model="account.account.template">
+		  <field name="code">473000</field>
+		  <field name="name">Autres allocataires à payer</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_47"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_480000" model="account.account.template">
+		  <field name="code">480000</field>
+		  <field name="name">Obligations et coupons échus (dettes)</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_48"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_487000" model="account.account.template">
+		  <field name="code">487000</field>
+		  <field name="name">Cautionnements reçus en numeraire</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_48"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_488000" model="account.account.template">
+		  <field name="code">488000</field>
+		  <field name="name">Autres dettes diverses</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_48"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_490000" model="account.account.template">
+		  <field name="code">490000</field>
+		  <field name="name">Charges à reporter (payées d&apos;avance)</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_49"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_491000" model="account.account.template">
+		  <field name="code">491000</field>
+		  <field name="name">Produits acquis</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_49"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_492000" model="account.account.template">
+		  <field name="code">492000</field>
+		  <field name="name">Charges à imputer</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_49"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_493000" model="account.account.template">
+		  <field name="code">493000</field>
+		  <field name="name">Produits à reporter</field>
+		  <field name="user_type" ref="account_type_liability"/>
+
+		  <field name="parent_id" ref="account_49"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_499000" model="account.account.template">
+		  <field name="code">499000</field>
+		  <field name="name">Comptes d&apos;attente</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_49"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_499800" model="account.account.template">
+		  <field name="code">499800</field>
+		  <field name="name">Solde équilibre en devises (hors pc)</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_49"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_500000" model="account.account.template">
+		  <field name="code">500000</field>
+		  <field name="name">Actions propres</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_510000" model="account.account.template">
+		  <field name="code">510000</field>
+		  <field name="name">Actions et parts</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_51"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_510100" model="account.account.template">
+		  <field name="code">510100</field>
+		  <field name="name">Montant non appelé s/action.part</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_51"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_510900" model="account.account.template">
+		  <field name="code">510900</field>
+		  <field name="name">Réduction valeur s/action et parts</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_51"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_512000" model="account.account.template">
+		  <field name="code">512000</field>
+		  <field name="name">Parts dans entreprises liées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_512"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_512100" model="account.account.template">
+		  <field name="code">512100</field>
+		  <field name="name">Montant non appelé s/parts</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_512"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_512900" model="account.account.template">
+		  <field name="code">512900</field>
+		  <field name="name">Réduction valeur s/part ent. liées</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_512"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_520000" model="account.account.template">
+		  <field name="code">520000</field>
+		  <field name="name">Titres à rev. fixes - valeur d&apos;acquis.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_52"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_529000" model="account.account.template">
+		  <field name="code">529000</field>
+		  <field name="name">Titres à rev. fixes - réd. de val.</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_52"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_530000" model="account.account.template">
+		  <field name="code">530000</field>
+		  <field name="name">Dépôts à terme</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_53"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_539000" model="account.account.template">
+		  <field name="code">539000</field>
+		  <field name="name">Réductions de valeur / dépôts à terme</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_53"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_540000" model="account.account.template">
+		  <field name="code">540000</field>
+		  <field name="name">Valeurs échues à l&apos;encaissement</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_541000" model="account.account.template">
+		  <field name="code">541000</field>
+		  <field name="name">Coupons à encaisser</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_550000" model="account.account.template">
+		  <field name="code">550000</field>
+		  <field name="name">Ets de crédit-compte à vue</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_550"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_550100" model="account.account.template">
+		  <field name="code">550100</field>
+		  <field name="name">Chèques et virements émis</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_550"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_550900" model="account.account.template">
+		  <field name="code">550900</field>
+		  <field name="name">Réduction valeur s/cpte a vue</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_550"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_560000" model="account.account.template">
+		  <field name="code">560000</field>
+		  <field name="name">Ccp - compte courant</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_56"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_561000" model="account.account.template">
+		  <field name="code">561000</field>
+		  <field name="name">Ccp - chèques émis</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_56"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_570000" model="account.account.template">
+		  <field name="code">570000</field>
+		  <field name="name">Caisses</field>
+		  <field name="user_type" ref="account_type_asset"/>
+
+		  <field name="parent_id" ref="account_57"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_570900" model="account.account.template">
+		  <field name="code">570900</field>
+		  <field name="name">Réduction valeur s/caisse</field>
+		  <field name="user_type" ref="account_type_root"/>
+
+		  <field name="parent_id" ref="account_57"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_580000" model="account.account.template">
+		  <field name="code">580000</field>
+		  <field name="name">Virements internes</field>
+		  <field name="user_type" ref="account_type_root"/>
+		  <field name="reconcile">True</field>
+
+		  <field name="parent_id" ref="account_5"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_600000" model="account.account.template">
+		  <field name="code">600000</field>
+		  <field name="name">Achats de matières premières</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_60"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_601000" model="account.account.template">
+		  <field name="code">601000</field>
+		  <field name="name">Achats de fournitures</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_60"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_602000" model="account.account.template">
+		  <field name="code">602000</field>
+		  <field name="name">Achats de services, travaux et études</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_60"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_603000" model="account.account.template">
+		  <field name="code">603000</field>
+		  <field name="name">Achats de sous-traitances générales</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_60"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_604000" model="account.account.template">
+		  <field name="code">604000</field>
+		  <field name="name">Achats de marchandises</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_60"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_607000" model="account.account.template">
+		  <field name="code">607000</field>
+		  <field name="name">Achats  produits et demi-produits</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_60"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_608000" model="account.account.template">
+		  <field name="code">608000</field>
+		  <field name="name">Remises, ristournes et rabais sur achats</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_60"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_609000" model="account.account.template">
+		  <field name="code">609000</field>
+		  <field name="name">Variation de stock mat. premières</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_609"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_609100" model="account.account.template">
+		  <field name="code">609100</field>
+		  <field name="name">Variation stock mat. consommables</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_609"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_609400" model="account.account.template">
+		  <field name="code">609400</field>
+		  <field name="name">Variation stock marchandises</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_609"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_610000" model="account.account.template">
+		  <field name="code">610000</field>
+		  <field name="name">Loyers et charges locatives</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_610"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_610100" model="account.account.template">
+		  <field name="code">610100</field>
+		  <field name="name">Redevances de crédit bail</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_610"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_611000" model="account.account.template">
+		  <field name="code">611000</field>
+		  <field name="name">Entretiens et réparations des locaux</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_61"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612000" model="account.account.template">
+		  <field name="code">612000</field>
+		  <field name="name">Consommation - eau</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6120"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612010" model="account.account.template">
+		  <field name="code">612010</field>
+		  <field name="name">Consommation - gaz</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6120"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612020" model="account.account.template">
+		  <field name="code">612020</field>
+		  <field name="name">Consommation  - électricité</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6120"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612030" model="account.account.template">
+		  <field name="code">612030</field>
+		  <field name="name">Consommation - carburants</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6120"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612040" model="account.account.template">
+		  <field name="code">612040</field>
+		  <field name="name">Consommation - mazout</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6120"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612100" model="account.account.template">
+		  <field name="code">612100</field>
+		  <field name="name">Documentation</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_612"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612200" model="account.account.template">
+		  <field name="code">612200</field>
+		  <field name="name">Imprimés et fournitures de bureau</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_612"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612300" model="account.account.template">
+		  <field name="code">612300</field>
+		  <field name="name">Téléphone</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6123"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612310" model="account.account.template">
+		  <field name="code">612310</field>
+		  <field name="name">Frais postaux</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6123"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_612320" model="account.account.template">
+		  <field name="code">612320</field>
+		  <field name="name">Fax</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6123"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_613000" model="account.account.template">
+		  <field name="code">613000</field>
+		  <field name="name">Redevances et royalties</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_613"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_613100" model="account.account.template">
+		  <field name="code">613100</field>
+		  <field name="name">Honoraires</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_613"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_613200" model="account.account.template">
+		  <field name="code">613200</field>
+		  <field name="name">Organismes de services</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_613"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_613300" model="account.account.template">
+		  <field name="code">613300</field>
+		  <field name="name">Commissions</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_613"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_614000" model="account.account.template">
+		  <field name="code">614000</field>
+		  <field name="name">Assurance incendie</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_61"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_615000" model="account.account.template">
+		  <field name="code">615000</field>
+		  <field name="name">Annonces, publicité</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_615"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_615100" model="account.account.template">
+		  <field name="code">615100</field>
+		  <field name="name">Cotisations et abonnements</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_615"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_615200" model="account.account.template">
+		  <field name="code">615200</field>
+		  <field name="name">Dons et libéralités</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_615"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_615300" model="account.account.template">
+		  <field name="code">615300</field>
+		  <field name="name">Publications légales</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_615"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_616000" model="account.account.template">
+		  <field name="code">616000</field>
+		  <field name="name">Sous-traitants</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_61"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_616100" model="account.account.template">
+		  <field name="code">616100</field>
+		  <field name="name">Transports par tiers</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_61"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_620000" model="account.account.template">
+		  <field name="code">620000</field>
+		  <field name="name">Rémunératons administrat. ou gérants</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_620"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_620100" model="account.account.template">
+		  <field name="code">620100</field>
+		  <field name="name">Rémunérations personnel de direction</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_620"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_620200" model="account.account.template">
+		  <field name="code">620200</field>
+		  <field name="name">Rémunérations employés</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_620"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_620300" model="account.account.template">
+		  <field name="code">620300</field>
+		  <field name="name">Rémunérations ouvriers</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_620"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_621000" model="account.account.template">
+		  <field name="code">621000</field>
+		  <field name="name">Chg.soc.lég.administ.et gérant</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_621"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_621100" model="account.account.template">
+		  <field name="code">621100</field>
+		  <field name="name">Chg.soc.lég. personnel de direction</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_621"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_621200" model="account.account.template">
+		  <field name="code">621200</field>
+		  <field name="name">Chg.soc.lég. employés</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_621"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_621300" model="account.account.template">
+		  <field name="code">621300</field>
+		  <field name="name">Chg.soc.lég. ouvriers</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_621"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_621400" model="account.account.template">
+		  <field name="code">621400</field>
+		  <field name="name">Assurance accidents</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_621"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_622000" model="account.account.template">
+		  <field name="code">622000</field>
+		  <field name="name">Primes patr. pour ass. extra - légales</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_62"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_623000" model="account.account.template">
+		  <field name="code">623000</field>
+		  <field name="name">Autres frais de personnel</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_62"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_624000" model="account.account.template">
+		  <field name="code">624000</field>
+		  <field name="name">Pension administrat. ou gérant</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_624"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_624100" model="account.account.template">
+		  <field name="code">624100</field>
+		  <field name="name">Pension personnel</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_624"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_630000" model="account.account.template">
+		  <field name="code">630000</field>
+		  <field name="name">Dot. cor. val s/frais d&apos;établissement</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_630"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_630100" model="account.account.template">
+		  <field name="code">630100</field>
+		  <field name="name">Dot. cor. val s/immob. incorporels</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_630"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_630200" model="account.account.template">
+		  <field name="code">630200</field>
+		  <field name="name">Dot. cor. val s/immob. corporels</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_630"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_631000" model="account.account.template">
+		  <field name="code">631000</field>
+		  <field name="name">Dot. cor. val s/stock mat.fourni</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_631"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_631100" model="account.account.template">
+		  <field name="code">631100</field>
+		  <field name="name">Reprises cor. val. s/stock mat. fourni</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_631"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_632000" model="account.account.template">
+		  <field name="code">632000</field>
+		  <field name="name">Dot. cor. val s/en-cours,pr fini</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_632"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_632100" model="account.account.template">
+		  <field name="code">632100</field>
+		  <field name="name">Reprises cor. val s/en-cours,pf</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_632"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_633000" model="account.account.template">
+		  <field name="code">633000</field>
+		  <field name="name">Dot. cor. val s/cr comm +1an</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_633"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_633100" model="account.account.template">
+		  <field name="code">633100</field>
+		  <field name="name">Reprises cor. val s/cr com +1an</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_633"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_634000" model="account.account.template">
+		  <field name="code">634000</field>
+		  <field name="name">Dot. cor. val. s/cr comm -1an</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_634"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_634100" model="account.account.template">
+		  <field name="code">634100</field>
+		  <field name="name">Reprises cor. val.s/cr com -1an</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_634"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_635000" model="account.account.template">
+		  <field name="code">635000</field>
+		  <field name="name">Dot. prov. pension et oblig. sim.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_635"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_635100" model="account.account.template">
+		  <field name="code">635100</field>
+		  <field name="name">Reprises prov. s/pens.obli. sim.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_635"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_636000" model="account.account.template">
+		  <field name="code">636000</field>
+		  <field name="name">Dot. prov-grosses réparation</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_636"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_636100" model="account.account.template">
+		  <field name="code">636100</field>
+		  <field name="name">Reprises prov. grosses réparation</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_636"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_637000" model="account.account.template">
+		  <field name="code">637000</field>
+		  <field name="name">Dot. prov-autres risques et chg</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_637"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_637100" model="account.account.template">
+		  <field name="code">637100</field>
+		  <field name="name">Reprises prov autres risq,chg</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_637"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_640000" model="account.account.template">
+		  <field name="code">640000</field>
+		  <field name="name">Taxe d&apos;abonnement</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_640"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_640100" model="account.account.template">
+		  <field name="code">640100</field>
+		  <field name="name">Impôt foncier</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_640"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_640200" model="account.account.template">
+		  <field name="code">640200</field>
+		  <field name="name">Impôt commercial s/le capital</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_640"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_640300" model="account.account.template">
+		  <field name="code">640300</field>
+		  <field name="name">Impôt s/la fortune</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_640"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_641000" model="account.account.template">
+		  <field name="code">641000</field>
+		  <field name="name">Moins-val. sur réalis. d&apos;immob. corp.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_64"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_642000" model="account.account.template">
+		  <field name="code">642000</field>
+		  <field name="name">Moins-val. / réalis. de créances comm.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_64"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_643000" model="account.account.template">
+		  <field name="code">643000</field>
+		  <field name="name">Charges d&apos;exploitation diverses</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_64"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_650000" model="account.account.template">
+		  <field name="code">650000</field>
+		  <field name="name">Intérêts, commissions et frais / dettes</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_65"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_651000" model="account.account.template">
+		  <field name="code">651000</field>
+		  <field name="name">Dot. cor. val s/actif circ</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_651"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_651100" model="account.account.template">
+		  <field name="code">651100</field>
+		  <field name="name">Reprises cor. val s/actif circulants</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_651"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_652000" model="account.account.template">
+		  <field name="code">652000</field>
+		  <field name="name">Moins-values sur réalis. d&apos;actifs circ.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_65"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_653000" model="account.account.template">
+		  <field name="code">653000</field>
+		  <field name="name">Charges d&apos;escompte de créances</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_65"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_654000" model="account.account.template">
+		  <field name="code">654000</field>
+		  <field name="name">Différences de change</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_65"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_655000" model="account.account.template">
+		  <field name="code">655000</field>
+		  <field name="name">Ecarts de conversion des devises</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_65"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_656000" model="account.account.template">
+		  <field name="code">656000</field>
+		  <field name="name">Frais de banque</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_65"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_660000" model="account.account.template">
+		  <field name="code">660000</field>
+		  <field name="name">Dot. cor. val exceptionnelles</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_660"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_660100" model="account.account.template">
+		  <field name="code">660100</field>
+		  <field name="name">Reprises cor. val. excep</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_660"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_661000" model="account.account.template">
+		  <field name="code">661000</field>
+		  <field name="name">Dot. cor. val s/immob. financières</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_661"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_661100" model="account.account.template">
+		  <field name="code">661100</field>
+		  <field name="name">Reprises cor val s/immob. fin.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_661"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_662000" model="account.account.template">
+		  <field name="code">662000</field>
+		  <field name="name">Dot. prov-risques et chg except.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_662"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_662100" model="account.account.template">
+		  <field name="code">662100</field>
+		  <field name="name">Reprises prov risq,chg except.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_662"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_663000" model="account.account.template">
+		  <field name="code">663000</field>
+		  <field name="name">Moins-values sur réalis. d&apos;actifs immob.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_66"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_665000" model="account.account.template">
+		  <field name="code">665000</field>
+		  <field name="name">Différences de change exceptionnelles</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_66"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_668000" model="account.account.template">
+		  <field name="code">668000</field>
+		  <field name="name">Autres charges exceptionnelles</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_66"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_670000" model="account.account.template">
+		  <field name="code">670000</field>
+		  <field name="name">Impôts luxemb sur le résultat de l&apos;ex.</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_67"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_671000" model="account.account.template">
+		  <field name="code">671000</field>
+		  <field name="name">Impôts luxemb /résultat d&apos;ex. antérieurs</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_67"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_672000" model="account.account.template">
+		  <field name="code">672000</field>
+		  <field name="name">Impôts étrangers sur le résultat de l&apos;ex</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_67"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_673000" model="account.account.template">
+		  <field name="code">673000</field>
+		  <field name="name">Impôts étrgs/résultat d&apos;ex. antérieurs</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_67"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_674000" model="account.account.template">
+		  <field name="code">674000</field>
+		  <field name="name">Impôts sur résultats exceptionnels</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_67"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_680000" model="account.account.template">
+		  <field name="code">680000</field>
+		  <field name="name">Transfert aux réserves immunisées</field>
+		  <field name="user_type" ref="account_type_expense"/>
+
+		  <field name="parent_id" ref="account_6"/>
+		  <field name="type">other</field>
+		</record>
+		<record id="account_700000" model="account.account.template">
+		  <field name="code">700000</field>
+		  <field name="name">Ventes et prestations de services</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_70"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_708000" model="account.account.template">
+		  <field name="code">708000</field>
+		  <field name="name">R.r.r accordés sur ventes</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_70"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_712000" model="account.account.template">
+		  <field name="code">712000</field>
+		  <field name="name">Variation de stocks des encours de fabr.</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_71"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_713000" model="account.account.template">
+		  <field name="code">713000</field>
+		  <field name="name">Variation de stocks des produits finis</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_71"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_720000" model="account.account.template">
+		  <field name="code">720000</field>
+		  <field name="name">Travaux effect. par entreprise elle-même</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_7"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_740000" model="account.account.template">
+		  <field name="code">740000</field>
+		  <field name="name">Subsides d&apos;exploitation</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_74"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_741000" model="account.account.template">
+		  <field name="code">741000</field>
+		  <field name="name">Plus-values sur réal. d&apos;immob. corp.</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_74"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_742000" model="account.account.template">
+		  <field name="code">742000</field>
+		  <field name="name">Plus-values sur réalis. créances comm.</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_74"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_743000" model="account.account.template">
+		  <field name="code">743000</field>
+		  <field name="name">Récupération de frais de personnel</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_74"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_744000" model="account.account.template">
+		  <field name="code">744000</field>
+		  <field name="name">Commissions et courtages</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_74"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_745000" model="account.account.template">
+		  <field name="code">745000</field>
+		  <field name="name">Redevances pour brevets et licences</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_74"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_746000" model="account.account.template">
+		  <field name="code">746000</field>
+		  <field name="name">Loyers perçus</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_74"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_748000" model="account.account.template">
+		  <field name="code">748000</field>
+		  <field name="name">Produits d&apos;exploitation divers.</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_74"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_750000" model="account.account.template">
+		  <field name="code">750000</field>
+		  <field name="name">Produits des participations</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_750"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_750100" model="account.account.template">
+		  <field name="code">750100</field>
+		  <field name="name">Autres produits des immob. financières</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_750"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_751000" model="account.account.template">
+		  <field name="code">751000</field>
+		  <field name="name">Produits des valeurs mobilières</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_751"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_751100" model="account.account.template">
+		  <field name="code">751100</field>
+		  <field name="name">Autres produits des actifs circulants</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_751"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_752000" model="account.account.template">
+		  <field name="code">752000</field>
+		  <field name="name">Plus-values sur réalis. d&apos;actifs circula</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_753000" model="account.account.template">
+		  <field name="code">753000</field>
+		  <field name="name">Subsides en capital et en intérêts</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_754000" model="account.account.template">
+		  <field name="code">754000</field>
+		  <field name="name">Différences de change</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_754100" model="account.account.template">
+		  <field name="code">754100</field>
+		  <field name="name">Amendes pour retards de paiement</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_754200" model="account.account.template">
+		  <field name="code">754200</field>
+		  <field name="name">Intérêts retards de paiement</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_755000" model="account.account.template">
+		  <field name="code">755000</field>
+		  <field name="name">Ecarts de conversion de devises</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_756000" model="account.account.template">
+		  <field name="code">756000</field>
+		  <field name="name">Autres produits financiers</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_757000" model="account.account.template">
+		  <field name="code">757000</field>
+		  <field name="name">Escomptes obtenus</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_75"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_763000" model="account.account.template">
+		  <field name="code">763000</field>
+		  <field name="name">Plus-values sur réalis. d&apos;actifs immob.</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_7"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_771000" model="account.account.template">
+		  <field name="code">771000</field>
+		  <field name="name">Régularis. d&apos;impôts luxemb sur résultat</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_77"/>
+		  <field name="type">payable</field>
+		</record>
+		<record id="account_773000" model="account.account.template">
+		  <field name="code">773000</field>
+		  <field name="name">Régularis. d&apos;impôts étrangers / résultat</field>
+		  <field name="user_type" ref="account_type_income"/>
+
+		  <field name="parent_id" ref="account_77"/>
+		  <field name="type">payable</field>
+		</record>
 
 
             <!-- Chart template -->
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
new file mode 100644
index 00000000000..f0655f3dc99
--- /dev/null
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <record id="config_call_account_template_lu" model="ir.actions.todo">
+        <field name="action_id" ref="account.action_wizard_multi_chart"/>
+        <field name="restart">onskip</field>
+    </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index 58cd78ca5a1..0e16c5ccf4c 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -5,7 +5,6 @@
 #Tranquil IT Systems
 
 from osv import osv, fields
-
 import pooler
 import tools
 from tools.translate import _
@@ -13,20 +12,25 @@ from report.render import render
 from report.interface import report_int
 
 class external_pdf(render):
+
     def __init__(self, pdf):
         render.__init__(self)
         self.pdf = pdf
         self.output_type='pdf'
+
     def _render(self):
         return self.pdf
 
 
 class report_custom(report_int):
-    def create(self, cr, uid, ids, datas, context={}):
 
-        pool = pooler.get_pool(cr.dbname)
+    def create(self, cr, uid, ids, datas, context=None):
 
+        pool = pooler.get_pool(cr.dbname)
         taxobj = pool.get('account.tax.code')
+
+        if context is None:
+            context = {}
         code_ids = taxobj.search(cr, uid, [('parent_id','child_of',[datas['form']['tax_code_id']])])
         result = {}
         for t in taxobj.browse(cr, uid, code_ids, {'period_id': datas['form']['period_id']}):
@@ -54,12 +58,12 @@ report_custom('report.l10n_lu.tax.report.print')
 class vat_declaration_report(osv.osv_memory):
     _name = 'vat.declaration.report'
     _description = 'VAT Declaration Report'
-    
+
     _columns = {
-         'tax_code_id': fields.many2one('account.tax.code', 'Company', required=True, domain=[('parent_id','=',False)]),
+         'tax_code_id': fields.many2one('account.tax.code', 'Company', readonly=False, required=True, domain=[('parent_id','=',False)]),
          'period_id' : fields.many2one('account.period', 'Period', required=True)
-        }
-    
+    }
+
     def print_vat_declaration_report(self, cr, uid, ids, context=None):
         active_ids = context.get('active_ids',[])
         data = {}
@@ -71,4 +75,4 @@ class vat_declaration_report(osv.osv_memory):
 
 vat_declaration_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index 2893670efb2..a8349de0bba 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -6,7 +6,7 @@
             <field name="model">vat.declaration.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form>
+            	<form string="Print Tax Statements">
 	               <field name="tax_code_id" widget="selection"/>
 	               <field name="period_id" widget="selection"/>
 	               <separator colspan="4"/>
@@ -30,5 +30,6 @@
 
        <menuitem id="legal_lu" parent="account.menu_finance_legal_statement" name="Luxembourg"/>
        <menuitem name="VAT Declaration" id="legal_lu_vat" parent="legal_lu" action="action_vat_report"/>
+
     </data>
 </openerp>
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index e479b835bbf..f0d6af479e7 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -27,6 +27,7 @@ from operator import itemgetter
 from traceback import format_exception
 from sys import exc_info
 from tools.safe_eval import safe_eval as eval
+import re
 
 from osv import fields, osv
 import netsvc
@@ -133,9 +134,9 @@ Normal - the campaign runs normally and automatically sends all emails and repor
 
             if activity.type != 'email':
                 continue
-            if not activity.email_template_id.enforce_from_account:
+            if not activity.email_template_id.from_account:
                 raise osv.except_osv(_("Error"), _("The campaign cannot be started: an email account is missing in the email activity '%s'")%activity.name)
-            if activity.email_template_id.enforce_from_account.state != 'approved':
+            if activity.email_template_id.from_account.state != 'approved':
                 raise osv.except_osv(_("Error"), _("The campaign cannot be started: the email account is not approved in the email activity '%s'")%activity.name)
 
         if not has_start and not has_signal_without_from:
@@ -211,14 +212,15 @@ class marketing_campaign_segment(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64,required=True),
         'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
-             required=True, select=1),
+             required=True, select=1, ondelete="cascade"),
         'object_id': fields.related('campaign_id','object_id',
                                       type='many2one', relation='ir.model',
                                       string='Object'),
         'ir_filter_id': fields.many2one('ir.filters', 'Filter', help=""),
         'sync_last_date': fields.datetime('Latest Synchronization'),
         'sync_mode': fields.selection([('create_date', 'If record created after last sync'),
-                                      ('write_date', 'If record modified after last sync (no duplicates)')],
+                                      ('write_date', 'If record modified after last sync (no duplicates)'),
+                                      ('all', 'All records (no duplicates)')],
                                       'Workitem creation mode',
                                       help="Determines when new workitems should be created for records matching a segment."),
         'state': fields.selection([('draft', 'Draft'),
@@ -269,13 +271,16 @@ class marketing_campaign_segment(osv.osv):
         action_date = time.strftime('%Y-%m-%d %H:%M:%S')
         campaigns = set()
         for segment in self.browse(cr, uid, segment_ids, context=context):
+            if segment.campaign_id.state != 'running':
+                continue
+            
             campaigns.add(segment.campaign_id.id)
             act_ids = self.pool.get('marketing.campaign.activity').search(cr,
                   uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)], context=context)
 
             model_obj = self.pool.get(segment.object_id.model)
             criteria = []
-            if segment.sync_last_date:
+            if segment.sync_last_date and segment.sync_mode != 'all':
                 criteria += [(segment.sync_mode, '>', segment.sync_last_date)]
             if segment.ir_filter_id:
                 criteria += eval(segment.ir_filter_id.domain)
@@ -284,7 +289,7 @@ class marketing_campaign_segment(osv.osv):
             # XXX TODO: rewrite this loop more efficiently without doing 1 search per record!
             for o_ids in model_obj.browse(cr, uid, object_ids, context=context):
                 # avoid duplicated workitem for the same resource
-                if segment.sync_mode == 'write_date':
+                if segment.sync_mode in ('write_date','all'):
                     wi_ids = Workitems.search(cr, uid, [('res_id','=',o_ids.id),('segment_id','=',segment.id)], context=context)
                     if wi_ids:
                         continue
@@ -332,17 +337,22 @@ class marketing_campaign_activity(osv.osv):
                                       type='many2one', relation='ir.model',
                                       string='Object', readonly=True),
         'start': fields.boolean('Start', help= "This activity is launched when the campaign starts.", select=True),
-        'condition': fields.char('Condition', size=256, required=True,
-                                 help="Python condition to know if the activity can be executed, otherwise it will be deleted or cancelled."),
+        'condition': fields.text('Condition', size=256, required=True,
+                                 help="Python expression to decide whether the activity can be executed, otherwise it will be deleted or cancelled."
+                                 "The expression may use the following [browsable] variables:\n"
+                                 "   - activity: the campaign activity\n"
+                                 "   - workitem: the campaign workitem\n" 
+                                 "   - object: the object this campaign item represents\n"
+                                 "   - transitions: list of campaign transitions outgoing from this activity\n"
+                                 "...- re: Python regular expression module"),
         'type': fields.selection(_action_types, 'Type', required=True,
                                   help="Describe type of action to be performed on the Activity.Eg : Send email,Send paper.."),
-        'email_template_id': fields.many2one('email.template','Email Template'),
-        'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),
+        'email_template_id': fields.many2one('email.template','The e-mail to send when this activity is activated'),
+        'report_id': fields.many2one('ir.actions.report.xml', 'The report to generate when this activity is activated', ),
         'report_directory_id': fields.many2one('document.directory','Directory',
-                                help="Folder is used to store the generated reports"),
+                                help="This folder is used to store the generated reports"),
         'server_action_id': fields.many2one('ir.actions.server', string='Action',
-                                help= "Describes the action name.\n"
-                                "eg:On which object which action to be taken on basis of which condition"),
+                                help= "The action to perform when this activity is activated"),
         'to_ids': fields.one2many('marketing.campaign.transition',
                                             'activity_from_id',
                                             'Next Activities'),
@@ -459,10 +469,10 @@ class marketing_campaign_transition(osv.osv):
                                 type='char', size=128),
         'activity_from_id': fields.many2one('marketing.campaign.activity',
                                             'Previous Activity', select=1,
-                                            required=True),
+                                            required=True, ondelete="cascade"),
         'activity_to_id': fields.many2one('marketing.campaign.activity',
                                           'Next Activity',
-                                          required=True),
+                                          required=True, ondelete="cascade"),
         'interval_nbr': fields.integer('Interval Value', required=True),
         'interval_type': fields.selection(_interval_units, 'Interval Unit',
                                           required=True),
@@ -550,7 +560,8 @@ class marketing_campaign_workitem(osv.osv):
             'activity': activity,
             'workitem': workitem,
             'object': object_id,
-            'transition': activity.to_ids
+            'transitions': activity.to_ids,
+            're': re,
         }
         try:
             condition = activity.condition
@@ -599,18 +610,19 @@ class marketing_campaign_workitem(osv.osv):
                     }
                     wi_id = self.create(cr, uid, values, context=context)
 
-                    # Now, depending of the trigger and the campaign mode
-                    # we know if must run the newly created workitem.
+                    # Now, depending on the trigger and the campaign mode
+                    # we know whether we must run the newly created workitem.
                     #
                     # rows = transition trigger \ colums = campaign mode
                     #
                     #           test    test_realtime     manual      normal (active)
                     # time       Y            N             N           N
                     # cosmetic   N            N             N           N
-                    # auto       Y            Y             Y           Y
+                    # auto       Y            Y             N           Y
                     #
 
-                    run = transition.trigger == 'auto' \
+                    run = (transition.trigger == 'auto' \
+                            and campaign_mode != 'manual') \
                           or (transition.trigger == 'time' \
                               and campaign_mode == 'test')
                     if run:
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 235d3ba34ce..1c0e4075b13 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -28,6 +28,7 @@
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" select="2" nolabel="1"/>
                     <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
+                    <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
                     <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
                     <button name="state_cancel_set" string="Cancelled" states="running" icon="terp-gtk-stop"/>
                 </group>
@@ -59,7 +60,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="start" invisible="1"/>
-                    <field name="condition"/>
+                    <field name="condition" widget="char"/>
                 </node>
                 <arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id" label="['name']">
                     <field name="activity_from_id"/>
@@ -148,7 +149,7 @@
                     <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
                     <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
                     <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
-                    <button name="state_draft_set" string="Set To Draft" states="cancelled" icon="gtk-convert"/>
+                    <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
                 </group>
             </form>
         </field>
@@ -235,7 +236,7 @@
                 <separator string="Action" colspan="4"/>
                 <group colspan='4' col='4'>
                     <group colspan="4" col="6">
-                        <field name="condition" colspan='5'/>
+                        <field name="condition" colspan="5" widget="char"/>
                         <group col='2'>
                             <field name="keep_if_condition_not_met" />
                         </group>
diff --git a/addons/marketing_campaign/marketing_campaign_workflow.xml b/addons/marketing_campaign/marketing_campaign_workflow.xml
index 0713ac8c7f5..4db60dbfa27 100644
--- a/addons/marketing_campaign/marketing_campaign_workflow.xml
+++ b/addons/marketing_campaign/marketing_campaign_workflow.xml
@@ -15,6 +15,8 @@
             <field name="wkf_id" ref="wkf_marketing_campaign"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'draft'})</field>
         </record>
 
         <record id="act_marketing_campaign_running" model="workflow.activity">
@@ -34,7 +36,7 @@
         <record id="act_marketing_campaign_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_marketing_campaign"/>
             <field name="name">cancel</field>
-            <field name="flow_stop">True</field>
+            <field name="flow_stop" eval="False"/>
             <field name="kind">function</field>
             <field name="action">state_cancel_set()</field>
         </record>
@@ -57,7 +59,19 @@
             <field name="act_to" ref="act_marketing_campaign_cancel"/>
             <field name="signal">state_cancel_set</field>
         </record>
-        
+
+        <record id="trans_campaign_done_draft" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_done"/>
+            <field name="act_to" ref="act_marketing_campaign_draft"/>
+            <field name="signal">state_draft_set</field>
+        </record>
+
+        <record id="trans_campaign_cancelled_draft" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_cancel"/>
+            <field name="act_to" ref="act_marketing_campaign_draft"/>
+            <field name="signal">state_draft_set</field>
+        </record>
+
          <!-- ==================Marketing Campaign Segment================== -->
     
         <record id="wkf_marketing_campaign_segment" model="workflow">
@@ -94,6 +108,7 @@
             <field name="name">cancel</field>
             <field name="kind">function</field>
             <field name="action">state_cancel_set()</field>
+            <field name="flow_stop" eval="False"/>
         </record>
 
                             <!-- Transition -->
@@ -120,5 +135,11 @@
             <field name="act_to" ref="act_marketing_campaign_segment_draft"/>
             <field name="signal">state_draft_set</field>
         </record>
+
+        <record id="trans_campaign_segment_done_draft" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_segment_done"/>
+            <field name="act_to" ref="act_marketing_campaign_segment_draft"/>
+            <field name="signal">state_draft_set</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 5ca820d1b49..ea6fcf9ae05 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:30+0000\n"
+"PO-Revision-Date: 2010-08-18 13:17+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 4c47d35f059..6ab1bf77129 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
+"PO-Revision-Date: 2010-08-18 13:16+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index ba792fadb9d..5b50b9caa22 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:34+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index 6fcaff80e14..ce73521928b 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:29+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp_jit/i18n/id.po b/addons/mrp_jit/i18n/id.po
index 715aa5e435d..56468c2ac89 100644
--- a/addons/mrp_jit/i18n/id.po
+++ b/addons/mrp_jit/i18n/id.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:52+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-08-18 10:20+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
-msgstr ""
+msgstr "MRP JIT"
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 7707226e654..82815c93bc7 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:26+0000\n"
+"PO-Revision-Date: 2010-08-18 13:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 0a394743c62..24cb464db71 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:24+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index 6bead10dea6..76d7515818b 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:30+0000\n"
+"PO-Revision-Date: 2010-08-18 13:14+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/olap/i18n/et.po b/addons/olap/i18n/et.po
index 73de7de78f4..15cda55bfcd 100644
--- a/addons/olap/i18n/et.po
+++ b/addons/olap/i18n/et.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 05:24+0000\n"
-"PO-Revision-Date: 2010-08-16 20:37+0000\n"
+"PO-Revision-Date: 2010-08-17 10:28+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-08-17 07:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap_crm/i18n/it.po b/addons/olap_crm/i18n/it.po
new file mode 100644
index 00000000000..76c8378ea2b
--- /dev/null
+++ b/addons/olap_crm/i18n/it.po
@@ -0,0 +1,31 @@
+# Italian 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-26 05:29+0000\n"
+"PO-Revision-Date: 2010-08-18 13:38+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"Language-Team: Italian <it@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-08-19 03:49+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_crm
+#: model:ir.module.module,description:olap_crm.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_crm
+#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
+msgid "olap_crm"
+msgstr "olap_crm"
diff --git a/addons/olap_sale/i18n/it.po b/addons/olap_sale/i18n/it.po
new file mode 100644
index 00000000000..734d3c768b2
--- /dev/null
+++ b/addons/olap_sale/i18n/it.po
@@ -0,0 +1,34 @@
+# Italian 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-26 05:29+0000\n"
+"PO-Revision-Date: 2010-08-18 10:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Italian <it@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-08-19 03:49+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+"\n"
+"    Il modulo di Vendita caricherà i dati in tabelle OLAP\n"
+"    "
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr "olap_sale"
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index 35a2ec53372..16dc11947a9 100644
--- a/addons/point_of_sale/i18n/it.po
+++ b/addons/point_of_sale/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 08:44+0000\n"
-"Last-Translator: Luca Bedogni <me@lucabedogni.it>\n"
+"PO-Revision-Date: 2010-08-18 09:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -92,7 +92,7 @@ msgstr "Vendite (Cronologia)"
 #. module: point_of_sale
 #: help:pos.order,user_id:0
 msgid "This is the logged in user (not necessarily the salesman)."
-msgstr ""
+msgstr "Questo è l'utente loggato (non necessariamente il venditore)."
 
 #. module: point_of_sale
 #: wizard_view:pos.sale.get,init:0
@@ -226,7 +226,7 @@ msgstr "Ordini di Rimborso"
 #. module: point_of_sale
 #: field:pos.order,last_out_picking:0
 msgid "Last Output Picking"
-msgstr ""
+msgstr "Ultimo raccolta in uscita"
 
 #. module: point_of_sale
 #: wizard_view:pos.config.journal,init:0
@@ -427,7 +427,7 @@ msgstr "Righe Punto Vendita del Giorno"
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
 msgid "Number of Print"
-msgstr ""
+msgstr "Numero di copie da stampare"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_default_journal
@@ -447,7 +447,7 @@ msgstr "Sconto (%)"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Commento Posizione Fiscale:"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_add_product
@@ -487,7 +487,7 @@ msgstr "Punto Vendita"
 #. module: point_of_sale
 #: field:pos.order,salesman_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Venditore"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -514,7 +514,7 @@ msgstr "Totale del Giorno"
 #. module: point_of_sale
 #: wizard_button:pos.scan_product,init,add:0
 msgid "Add"
-msgstr ""
+msgstr "Aggiungi"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
@@ -576,12 +576,12 @@ msgstr "Utente"
 #. module: point_of_sale
 #: field:pos.payment,payment_date:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Data di pagamento"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_name:0
 msgid "Payment Name"
-msgstr ""
+msgstr "Nome del Pagamento"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -691,12 +691,12 @@ msgstr "Ordine Rimborso:"
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
 msgid "Number of Transaction"
-msgstr ""
+msgstr "Numero di transazioni"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Imponibile Totale"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -773,7 +773,7 @@ msgstr "Sconto Totale"
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Crea la fattura"
 
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
@@ -820,7 +820,7 @@ msgstr "Registro"
 #. module: point_of_sale
 #: wizard_field:pos.scan_product,init,gencod:0
 msgid "Barcode"
-msgstr ""
+msgstr "Codice a barre"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -840,12 +840,12 @@ msgstr "Righe Punto Vendita"
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_nb:0
 msgid "Piece Number"
-msgstr ""
+msgstr "Numero di pezzi"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal_gift:0
@@ -911,7 +911,7 @@ msgstr "Registrazione Contabile"
 #: wizard_field:pos.payment,ask_pay,payment_id:0
 #: field:pos.payment,payment_id:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Termini di pagamento"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -929,7 +929,7 @@ msgstr "Azioni"
 #. module: point_of_sale
 #: help:pos.order,salesman_id:0
 msgid "This is the salesman actually making the order."
-msgstr ""
+msgstr "Questo è il venditore che attualmente sta facendo l'ordine"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -952,12 +952,12 @@ msgstr "Azienda:"
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Print Date"
-msgstr ""
+msgstr "Data di stampa"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "OPERATION N° :"
-msgstr ""
+msgstr "N° operazione"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index c88b0068998..fab2c74a7f3 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:23+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 29a7db0c325..ab6b47445d8 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:26+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index bf9204a26f1..d2c16b2b5ea 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -13,7 +13,7 @@
                 <form string="Sales Order POS">
                     <group col="6" colspan="4">
                         <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
-                        <field name="contract_number" groups="base.group_extended"/> -->
+                        <field name="contract_number" groups="base.group_extended"/>
 
                     </group>
                      <notebook colspan="4">
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index cfcd2f5f53a..41a9c62e777 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:37+0000\n"
+"PO-Revision-Date: 2010-08-18 12:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index a3ca6ce0ed8..aa5552f0b0c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -260,7 +260,7 @@
             res_model="stock.warehouse.orderpoint"
             src_model="procurement.order"/>
 
-		<menuitem id="base.menu_mrp_scheduler" name="Schedulers" parent="stock.menu_stock_root" groups="base.group_system" sequence="10"/>
+		<menuitem id="base.menu_mrp_scheduler" name="Schedulers" parent="stock.menu_stock_root" groups="base.group_system" sequence="3"/>
 		<menuitem action="action_compute_schedulers" id="base.mrp_Sched_all" parent="base.menu_mrp_scheduler" sequence="50" groups="base.group_system"/>
 		<menuitem action="procurement.procurement_action" id="base.menu_mrp_procurement_action" parent="stock.menu_stock_warehouse_mgmt" sequence="9" groups="base.group_system"/>		
     </data>
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 325c1632b6a..b56f06f971b 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 08:58+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 10:11+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -458,7 +458,7 @@ msgstr "Margine Minimo"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "* ( 1 + "
-msgstr "( 1 - "
+msgstr "* ( 1 + "
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index e6c35c55430..a9d65ddcfb0 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:30+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index f61be3c376f..ec7010aeb9c 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
+"PO-Revision-Date: 2010-08-18 13:12+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index eeee6bbb163..3bab518990e 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 2dbf75c967d..ad07d952ddd 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:47+0000\n"
+"PO-Revision-Date: 2010-08-18 13:34+0000\n"
 "Last-Translator: Sonja Sardelić <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 413fd38ae63..b2aaa854b13 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:36+0000\n"
+"PO-Revision-Date: 2010-08-18 12:46+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 570ffe24765..36d2a49f1f2 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:33+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 64e59652241..f93329bfa4b 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:24+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index d0bb7cc7835..70d14fbd813 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:47+0000\n"
+"PO-Revision-Date: 2010-08-18 13:34+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_visible_discount/i18n/it.po b/addons/product_visible_discount/i18n/it.po
new file mode 100644
index 00000000000..7d3c08d60a5
--- /dev/null
+++ b/addons/product_visible_discount/i18n/it.po
@@ -0,0 +1,61 @@
+# Italian 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-03-25 12:11+0000\n"
+"PO-Revision-Date: 2010-08-18 07:07+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"Language-Team: Italian <it@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-08-19 03:49+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per visualizzare l'Achitettura!"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+"    This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"    To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+"    Example:\n"
+"        For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+"        If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+"        If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+"    "
+msgstr ""
+"\n"
+"    Questo modulo di permette di calcolare gli sconti sulle linee degli "
+"ordini di vendita e su quelle delle fatture basandosi su un listino del "
+"partner.\n"
+"    Installandolo, una nuova spunta chiamata \"Sconto visibile\" è aggiunta "
+"alla videata del listino.\n"
+"    Esempio:\n"
+"        Per il prodotto PC1 e partner \"Asustek\": se il prezzo di "
+"listino=450, e il prezzo è calcolato usando il listino Asustek + 225\n"
+"        Se c'è la spunta avremmo, sulla linea dell'ordine di vedita: Prezzo "
+"unitario=450, Sconto=50.00, Prezzo Netto=225\n"
+"        Se non c'è la spunta avremmo, sulla linea dell'ordine e sulla linea "
+"della fattura: Prezzo unitario=225, Sconto=0.00, Prezzo netto=225\n"
+"    "
+
+#. module: product_visible_discount
+#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Sconto Visibile"
diff --git a/addons/profile_accounting/i18n/tr.po b/addons/profile_accounting/i18n/tr.po
index 5e893b9c02a..99da0f543e8 100644
--- a/addons/profile_accounting/i18n/tr.po
+++ b/addons/profile_accounting/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index d457b2bd4b9..b18fbca2fb6 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 12:33+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-17 09:52+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-18 10:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 917e30db1f9..bdb1191540d 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:31+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 4f06d32e48b..c96a821e572 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 52f2dc4cc79..4ad024d1cbe 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:01+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/project.py b/addons/project/project.py
index 8d3f4150471..eb73cfefd88 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -438,6 +438,7 @@ class task(osv.osv):
         'sequence': 10,
         'active': True,
         'project_id': _default_project,
+        'user_id': lambda obj, cr, uid, context: uid,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c)
     }
 
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 672796c768b..41938de1c47 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index bb42cb40acf..ed09204e54c 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:54+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:28+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_planning/i18n/hr.po b/addons/project_planning/i18n/hr.po
index 83c8ed7f20f..7b5b30fac67 100644
--- a/addons/project_planning/i18n/hr.po
+++ b/addons/project_planning/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:40+0000\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project_planning/i18n/tr.po b/addons/project_planning/i18n/tr.po
index 2756f32e9c4..effa13ed830 100644
--- a/addons/project_planning/i18n/tr.po
+++ b/addons/project_planning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:45+0000\n"
+"PO-Revision-Date: 2010-08-18 13:24+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_planning
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index b34516509f5..e2870a49af1 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:10+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:18+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 3848d0108d7..8e1744b6025 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:39+0000\n"
+"PO-Revision-Date: 2010-08-18 13:08+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 175a80b2139..127eee4f42f 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index aebec5f2c46..2c203cd43a7 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:37+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 416044e1bee..1ef258095b2 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:26+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 86251cadc13..344d621f94a 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:12+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index 697085a5fb0..bc8b66be803 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:30+0000\n"
+"PO-Revision-Date: 2010-08-18 13:16+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 8fcb7ab91a7..2156a3fab56 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:29+0000\n"
+"PO-Revision-Date: 2010-08-18 13:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index d0f2f57e680..82d68f53ef4 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     "name" : "Resource",
     "version" : "1.1",
@@ -36,7 +35,7 @@
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process'],
+    'depends': ['process'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
@@ -48,4 +47,5 @@
     'active': False,
     'certificate': None,
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/resource/i18n/en_US.po b/addons/resource/i18n/en_US.po
new file mode 100644
index 00000000000..8c4932c4a6d
--- /dev/null
+++ b/addons/resource/i18n/en_US.po
@@ -0,0 +1,318 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* resource
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-08-18 06:50:02+0000\n"
+"PO-Revision-Date: 2010-08-18 06:50:02+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid "If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"
+msgstr "If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Friday"
+
+#. module: resource
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "The Object name must start with x_ and not contain any special character !"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Resource Type"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "Leave Detail"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "Resources Leaves"
+
+#. module: resource
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: view:resource.calendar.leaves:0
+msgid "Working Time"
+msgstr "Working Time"
+
+#. module: resource
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalid XML for View Architecture!"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Thursday"
+
+#. module: resource
+#: view:resource.calendar:0
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Group By..."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Sunday"
+
+#. module: resource
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Invalid model name in the action definition."
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "Search Resource"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Type"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Resources"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Workgroup manager"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Period"
+msgstr "Search Working Period"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Monday"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Resource Calendar"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Company"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Material"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Day of week"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Starting date"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "User"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Date"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "Search Working Period Leaves"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "End Date"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "Closing Days"
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "Resource"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid "\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr "\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid "If the active field is set to true, it will allow you to hide the resource record without removing it."
+msgstr "If the active field is set to true, it will allow you to hide the resource record without removing it."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Wednesday"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+msgid "Working Period"
+msgstr "Working Period"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "Resource Detail"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "Active"
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "Resource's Calendar"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr "Related user name for the resource to manage its access."
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "Define the schedule of resource"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "Work from"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "Code"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Work to"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid "This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."
+msgstr "This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Tuesday"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working time"
+msgstr "Working time"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+msgid "Resource Leaves"
+msgstr "Resource Leaves"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Manager"
+msgstr "Manager"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:0
+#, python-format
+msgid "(vacation)"
+msgstr "(vacation)"
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr "Efficiency factor"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "Human"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "Work Detail"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Start Date"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Saturday"
+
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
new file mode 100644
index 00000000000..7e201b5aa73
--- /dev/null
+++ b/addons/resource/i18n/fr.po
@@ -0,0 +1,310 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* resource
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-08-18 06:50:02+0000\n"
+"PO-Revision-Date: 2010-08-18 06:50:02+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid "If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr ""
+
+#. module: resource
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: view:resource.calendar.leaves:0
+msgid "Working Time"
+msgstr ""
+
+#. module: resource
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr ""
+
+#. module: resource
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Period"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr ""
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr ""
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid "\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid "If the active field is set to true, it will allow you to hide the resource record without removing it."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+msgid "Working Period"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid "This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working time"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Manager"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:0
+#, python-format
+msgid "(vacation)"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr ""
\ No newline at end of file
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
new file mode 100644
index 00000000000..7e201b5aa73
--- /dev/null
+++ b/addons/resource/i18n/resource.pot
@@ -0,0 +1,310 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* resource
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-08-18 06:50:02+0000\n"
+"PO-Revision-Date: 2010-08-18 06:50:02+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid "If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr ""
+
+#. module: resource
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: view:resource.calendar.leaves:0
+msgid "Working Time"
+msgstr ""
+
+#. module: resource
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr ""
+
+#. module: resource
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Period"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr ""
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr ""
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid "\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid "If the active field is set to true, it will allow you to hide the resource record without removing it."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+msgid "Working Period"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid "This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working time"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Manager"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:0
+#, python-format
+msgid "(vacation)"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr ""
\ No newline at end of file
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index ce5ce05633d..d31511e33e5 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from datetime import datetime, timedelta
 import time
 import math
@@ -37,23 +38,23 @@ class resource_calendar(osv.osv):
     _defaults = {
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=context)
     }
-    
+
     def _get_leaves(self, cr, uid, id, resource):
         resource_cal_leaves = self.pool.get('resource.calendar.leaves')
         dt_leave = []
-        
+
         resource_leave_ids = resource_cal_leaves.search(cr, uid, [('calendar_id','=',id), '|', ('resource_id','=',False), ('resource_id','=',resource)])
         res_leaves = resource_cal_leaves.read(cr, uid, resource_leave_ids, ['date_from', 'date_to'])
-        
+
         for leave in res_leaves:
             dtf = datetime.strptime(leave['date_from'], '%Y-%m-%d %H:%M:%S')
             dtt = datetime.strptime(leave['date_to'], '%Y-%m-%d %H:%M:%S')
             no = dtt - dtf
             [dt_leave.append((dtf + timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
             dt_leave.sort()
-        
+
         return dt_leave
-    
+
     def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False):
         if not id:
             td = int(hours)*3
@@ -127,14 +128,14 @@ class resource_calendar(osv.osv):
             current_hour = 0
             maxrecur -= 1
         return result
-    
+
     def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False):
         result = []
         if not id:
             return 0.0
         dt_leave = self._get_leaves(cr, uid, id, resource)
         hours = 0.0
-        
+
         current_hour = dt_from.hour
 
         while (dt_from <= dt_to):
@@ -150,16 +151,16 @@ class resource_calendar(osv.osv):
                         if dt_check == leave:
                             dt_check = datetime.strptime(dt_check, "%Y-%m-%d") + timedelta(days=1)
                             leave_flag = True
-                    
+
                     if leave_flag:
                         break
                     else:
                         d1 = dt_from
                         d2 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60))
-                        
+
                         if hours != 0.0:#For first time of the loop only,hours will be 0
                             d1 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60))
-                            
+
                         if dt_from.day == dt_to.day:
                             if hour_from <= dt_to.hour <= hour_to:
                                 d2 = dt_to
@@ -167,8 +168,9 @@ class resource_calendar(osv.osv):
                         hours += (d2-d1).seconds
             dt_from = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60)) + timedelta(days=1)
             current_hour = 0.0
+
         return (hours/3600)
-    
+
 resource_calendar()
 
 class resource_calendar_attendance(osv.osv):
@@ -229,6 +231,7 @@ class resource_calendar_leaves(osv.osv):
         'date_to' : fields.datetime('End Date', required=True),
         'resource_id' : fields.many2one("resource.resource", "Resource", help="If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"),
     }
+
     def check_dates(self, cr, uid, ids, context={}):
          leave = self.read(cr, uid, ids[0], ['date_from', 'date_to'])
          if leave['date_from'] and leave['date_to']:
@@ -240,7 +243,7 @@ class resource_calendar_leaves(osv.osv):
         (check_dates, 'Error! leave start-date must be lower then leave end-date.', ['date_from', 'date_to'])
     ]
 
-    def onchange_resource(self,cr, uid, ids, resource, context={}):
+    def onchange_resource(self,cr, uid, ids, resource, context=None):
         result = {}
         if resource:
             resource_pool = self.pool.get('resource.resource')
@@ -249,4 +252,5 @@ class resource_calendar_leaves(osv.osv):
         return {'value': {'calendar_id': []}}
 
 resource_calendar_leaves()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index d4cbd5b6791..02b9abd882a 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -26,8 +26,7 @@
             </field>
         </record>
 
-
-       <record id="view_resource_calendar_search" model="ir.ui.view">
+       	<record id="view_resource_calendar_search" model="ir.ui.view">
             <field name="name">resource.calendar.search</field>
             <field name="model">resource.calendar</field>
             <field name="type">search</field>
@@ -117,6 +116,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_resource_calendar_attendance_form" model="ir.ui.view">
             <field name="name">resource.calendar.attendance.form</field>
             <field name="model">resource.calendar.attendance</field>
@@ -175,6 +175,7 @@
                 </form>
             </field>
         </record>
+
         <record id="resource_resource_tree" model="ir.ui.view">
             <field name="name">resource.resource.tree</field>
             <field name="model">resource.resource</field>
@@ -190,6 +191,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="action_resource_resource_tree" model="ir.actions.act_window">
             <field name="name">Resources</field>
             <field name="res_model">resource.resource</field>
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index 4d8541b4ab5..62fcf516a6b 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -31,5 +31,4 @@ import wizard
 import report
 import company
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 322f767ca51..ceab22fd98a 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Sales Management',
     'version': '1.0',
@@ -48,7 +47,7 @@
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['product', 'stock', 'procurement', 'process','board'],
+    'depends': ['stock', 'procurement', 'board'],
     'init_xml': [],
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',
@@ -68,7 +67,7 @@
         'board_sale_view.xml',
         'process/sale_process.xml',
     ],
-    'demo_xml': ['sale_demo.xml','board_sale_demo.xml'],
+    'demo_xml': ['sale_demo.xml'],
     'test': [
              'test/data_test.yml',
              'test/manual_order_policy.yml',
@@ -85,4 +84,4 @@
     'active': False,
     'certificate': '0058103601429',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/board_sale_demo.xml b/addons/sale/board_sale_demo.xml
deleted file mode 100644
index 39f923a895b..00000000000
--- a/addons/sale/board_sale_demo.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-    </data>
-</openerp>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index fd3ed38587c..3e19e2fb4ee 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -37,4 +37,4 @@
         <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0"/>
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_sales_manager"/>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale/company.py b/addons/sale/company.py
index 401a1a9c1d8..52d513f6dc9 100644
--- a/addons/sale/company.py
+++ b/addons/sale/company.py
@@ -29,9 +29,9 @@ class company(osv.osv):
             "for security purpose"),
     }
     _defaults = {
-        'security_lead': lambda *a: 5.0,
+        'security_lead': 5.0,
     }
+    
 company()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index ead9128d6f3..4088c38db08 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-
         <record id="mrp_company" model="ir.ui.view">
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
@@ -13,6 +12,5 @@
                 </page>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 78b684e9421..f184df4700d 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:36+0000\n"
+"PO-Revision-Date: 2010-08-18 12:49+0000\n"
 "Last-Translator: Renato Lima - http://www.akretion.com "
 "<renatonlima@gmail.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index a352a0c4586..48914f5d014 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:08+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:18+0000\n"
+"Last-Translator: vra (openerp) <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index abb637f34a8..06a4c1c2210 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:27+0000\n"
+"PO-Revision-Date: 2010-08-18 13:24+0000\n"
 "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 03cb3b91cf0..ca4766c17a4 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:19+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:12+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index e88f0f93fc8..a88be72e241 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:56+0000\n"
+"PO-Revision-Date: 2010-08-18 13:27+0000\n"
 "Last-Translator: Jay (OpenERP) <jvo@tinyerp.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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index fbe0515fcac..5d9667b1a06 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:28+0000\n"
+"PO-Revision-Date: 2010-08-18 13:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Vietnamese <vi@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-08-17 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/product.py b/addons/sale/product.py
index ab28e693524..95d45c29575 100644
--- a/addons/sale/product.py
+++ b/addons/sale/product.py
@@ -20,22 +20,20 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools import config
-
-
 
 class product_product(osv.osv):
-    _name = 'product.product'
     _inherit = 'product.product'
 
     def _pricelist_calculate(self, cr, uid, ids, name, arg, context=None):
         result = {}
-        pricelist_obj=self.pool.get('product.pricelist')
-        if name=='pricelist_purchase':
-            pricelist_ids=pricelist_obj.search(cr,uid,[('type','=','purchase')])
+        pricelist_obj = self.pool.get('product.pricelist')
+        if context is None:
+            context = {}
+        if name == 'pricelist_purchase':
+            pricelist_ids = pricelist_obj.search(cr,uid,[('type','=','purchase')])
         else:
-            pricelist_ids=pricelist_obj.search(cr,uid,[('type','=','sale')])
-        pricelist_browse=pricelist_obj.browse(cr,uid,pricelist_ids)
+            pricelist_ids = pricelist_obj.search(cr,uid,[('type','=','sale')])
+        pricelist_browse = pricelist_obj.browse(cr,uid,pricelist_ids)
         for product in self.browse(cr, uid, ids, context):
             result[product.id] = ""
             for pricelist in pricelist_browse:
@@ -70,4 +68,5 @@ class product_product(osv.osv):
     }
 
 product_product()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/report/__init__.py b/addons/sale/report/__init__.py
index fb04b328a57..99397dd4afd 100644
--- a/addons/sale/report/__init__.py
+++ b/addons/sale/report/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import sale_prepare_allot
-import order
+import sale_order
 import sale_report
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/report/order.py b/addons/sale/report/sale_order.py
index dcd6f54e047..cc1d89f9ed7 100644
--- a/addons/sale/report/order.py
+++ b/addons/sale/report/sale_order.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,21 +15,22 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import time
+
 from report import report_sxw
-from osv import osv
 
 class order(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
+    def __init__(self, cr, uid, name, context=None):
         super(order, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
-report_sxw.report_sxw('report.sale.order','sale.order','addons/sale/report/order.rml',parser=order)
+
+report_sxw.report_sxw('report.sale.order','sale.order','addons/sale/report/sale_order.rml',parser=order)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale/report/order.rml b/addons/sale/report/sale_order.rml
index 5f535a05371..5f535a05371 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/sale_order.rml
diff --git a/addons/sale/report/sale_prepare_allot.py b/addons/sale/report/sale_prepare_allot.py
index d5292b6d515..21a37797a73 100644
--- a/addons/sale/report/sale_prepare_allot.py
+++ b/addons/sale/report/sale_prepare_allot.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,20 +15,22 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import time
+
 from report import report_sxw
 
 class sale_prepare(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
+
+    def __init__(self, cr, uid, name, context=None):
         super(sale_prepare, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'allotment': self._allotment,
         })
-        
+
     def _allotment(self, object):
         allotments = {}
         for line in object.order_line:
@@ -39,8 +41,7 @@ class sale_prepare(report_sxw.rml_parse):
             allotments[line.address_allotment_id.id][1].append(line)
         return allotments.values()
 
-report_sxw.report_sxw('report.sale.order.prepare.allot', 'sale.order', 'addons/sale/report/prepare_allot.rml',parser=sale_prepare)
-
+report_sxw.report_sxw('report.sale.order.prepare.allot', 'sale.order', 'addons/sale/report/sale_prepare_allot.rml',parser=sale_prepare)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/report/prepare.rml b/addons/sale/report/sale_prepare_allot.rml
index 97ee442fd7a..97ee442fd7a 100644
--- a/addons/sale/report/prepare.rml
+++ b/addons/sale/report/sale_prepare_allot.rml
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 5a642c784f5..f84d9600dbc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -38,7 +38,7 @@ class sale_shop(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
         'project_id': fields.many2one('account.analytic.account', 'Analytic Account'),
-        'company_id': fields.many2one('res.company', 'Company'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
     }
 
 sale_shop()
@@ -771,6 +771,7 @@ sale_order()
 # - update it on change product and unit price
 # - use it in report if there is a uos
 class sale_order_line(osv.osv):
+
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
@@ -1170,9 +1171,9 @@ class sale_config_picking_policy(osv.osv_memory):
            "in one or two operations by the worker.")
     }
     _defaults = {
-        'picking_policy': lambda *a: 'direct',
-        'order_policy': lambda *a: 'manual',
-        'step': lambda *a: 'one'
+        'picking_policy': 'direct',
+        'order_policy': 'manual',
+        'step': 'one'
     }
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 59136f2b139..31ab58eb60b 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -2,9 +2,8 @@
 <openerp>
     <data noupdate="1">
     
-		<!--    
-	Resource: res.company
-	-->
+		<!--Resource: res.company-->
+		
 		<record id="res_company_shop_sale0" model="res.company">
             <field eval="5.0" name="security_lead"/>
             <field name="partner_id" ref="stock.res_partner_tinyshop0"/>
@@ -12,10 +11,8 @@
             <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
         </record>
 
-        <!--
-	Resource: sale.order
-	-->
-
+        <!--Resource: sale.order-->
+        
         <record id="order" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
@@ -26,10 +23,8 @@
             <field model="res.partner.address" name="partner_order_id" search="[]"/>
         </record>
 
-        <!--
-	Resource: sale.order.line
-	-->
-
+        <!--Resource: sale.order.line-->
+        
         <record id="line" model="sale.order.line">
             <field name="order_id" ref="order"/>
             <field name="name">New server config + material</field>
@@ -70,10 +65,8 @@
             <field name="type">make_to_stock</field>
         </record>
 
-        <!--
-	Resource: sale.order
-	-->
-
+        <!--Resource: sale.order-->
+        
         <record id="order2" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
@@ -84,10 +77,8 @@
             <field name="partner_order_id" ref="base.res_partner_address_9"/>
         </record>
 
-        <!--
-	Resource: sale.order.line
-	-->
-
+        <!--Resource: sale.order.line-->
+        
         <record id="line3" model="sale.order.line">
             <field name="order_id" ref="order2"/>
             <field name="name">[PC2] Computer assembled on demand</field>
@@ -107,9 +98,8 @@
             <field name="type">make_to_order</field>
         </record>
 
-        <!--
-	Resource: sale.order
-	-->
+        <!--Resource: sale.order-->
+        
         <record id="order3" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
@@ -141,9 +131,8 @@
         </record>
         <workflow action="order_confirm" model="sale.order" ref="order3"/>
 
-        <!--
-	Resource: sale.order
-	-->
+        <!--Resource: sale.order-->
+        
         <record id="order4" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
@@ -175,9 +164,8 @@
         </record>
         <workflow action="order_confirm" model="sale.order" ref="order4"/>
 
-        <!--
-	Resource: sale.order
-	-->
+        <!--Resource: sale.order-->
+        
         <record id="order5" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
@@ -202,9 +190,9 @@
         <!-- Run all schedulers -->
         <function model="procurement.order" name="run_scheduler"/>
 
-
         <!-- sale advance demo.. -->
 		<!-- Demo Data for Product -->
+		
 		<record id="advance_product_0" model="product.product">
 			<field name="name">Advance Product</field>
 			<field name="categ_id" ref="product.cat1"/>
@@ -216,4 +204,4 @@
 		</record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
index d85273fa9a0..92758559439 100644
--- a/addons/sale/sale_installer.py
+++ b/addons/sale/sale_installer.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 
 class sale_installer(osv.osv_memory):
@@ -41,4 +42,7 @@ class sale_installer(osv.osv_memory):
         'sale_order_dates': fields.boolean('Sale Order Dates',
             help="Add commitment, requested and effective dates on the sale order."),
         }
+    
 sale_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/sale_report.xml b/addons/sale/sale_report.xml
index f21f20c63f7..33819df0bde 100644
--- a/addons/sale/sale_report.xml
+++ b/addons/sale/sale_report.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/order.rml" string="Quotation / Order"/>
+        <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/sale_order.rml" string="Quotation / Order"/>
 
     </data>
 </openerp>
diff --git a/addons/sale/sale_sequence.xml b/addons/sale/sale_sequence.xml
index 5e5005d3b1b..8a500a9395c 100644
--- a/addons/sale/sale_sequence.xml
+++ b/addons/sale/sale_sequence.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
         <!-- Sequences for sale.order -->
         <record id="seq_type_sale_order" model="ir.sequence.type">
             <field name="name">Sale Order</field>
             <field name="code">sale.order</field>
         </record>
+
         <record id="seq_sale_order" model="ir.sequence">
             <field name="name">Sale Order</field>
             <field name="code">sale.order</field>
             <field name="prefix">SO</field>
             <field name="padding">3</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 6ff57e4d7d1..d8df1901024 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -29,6 +29,7 @@ class stock_move(osv.osv):
     _defaults = {
         'sale_line_id': False
     }
+    
 stock_move()
 
 class stock_picking(osv.osv):
@@ -115,6 +116,8 @@ class stock_picking(osv.osv):
         invoice_obj = self.pool.get('account.invoice')
         picking_obj = self.pool.get('stock.picking')
         invoice_line_obj = self.pool.get('account.invoice.line')
+        if context is None:
+            context = {}
 
         result = super(stock_picking, self).action_invoice_create(cursor, user,
                 ids, journal_id=journal_id, group=group, type=type,
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index ba6fd677a3c..6cf076164d8 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -23,5 +23,4 @@ import sale_make_invoice
 import sale_line_invoice
 import sale_make_invoice_advance
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 195931ecb04..b7ea27a3049 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -110,7 +110,6 @@ class sale_order_line_make_invoice(osv.osv_memory):
                     (order_id,invoice_id) values (%s,%s)', (order.id, res))
         return {}
 
-
 sale_order_line_make_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index eb9100c6777..63a26587d43 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -22,6 +22,5 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 850fc2e25d4..e1d26c7b987 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -29,15 +29,19 @@ class sale_make_invoice(osv.osv_memory):
         'grouped': fields.boolean('Group the invoices', help='Check the box to group the invoices for the same customers'),
         'invoice_date':fields.date('Invoice Date'),
     }
-    _default = {
-        'grouped' : lambda *a: False
+    _defaults = {
+        'grouped': False
     }
+    
     def view_init(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
         record_id = context and context.get('active_id', False)     
         order = self.pool.get('sale.order').browse(cr, uid, record_id)
         if order.state == 'draft':
             raise osv.except_osv(_('Warning !'),'You can not create invoice when sale order is not confirmed.')
         return False
+    
     def make_invoices(self, cr, uid, ids, context={}):
         order_obj = self.pool.get('sale.order')
         newinv = []
@@ -68,5 +72,5 @@ class sale_make_invoice(osv.osv_memory):
         }
 
 sale_make_invoice()        
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index 0bf0c37fdc2..2bef6b67513 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -28,4 +28,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index ec944553cdc..0eac0308acc 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -19,7 +19,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
 from tools.translate import _
 import ir
 
@@ -31,9 +30,10 @@ class sale_advance_payment_inv(osv.osv_memory):
         'amount': fields.float('Unit Price', size=(16, 2), required=True),
         'qtty': fields.float('Quantity', size=(16, 2), required=True),
     }
-    _default = {
-        'qtty' : lambda *a: 1
+    _defaults = {
+        'qtty': 1.0
     }
+
     def create_invoices(self, cr, uid, ids, context={}):
         """
              To create invoices.
@@ -65,7 +65,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                              that is defined as 'Automatic Invoice after delivery'."))
                 val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
                         uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
-                line_id =obj_lines.create(cr, uid, {
+                line_id = obj_lines.create(cr, uid, {
                     'name': val['value']['name'],
                     'account_id': val['value']['account_id'],
                     'price_unit': sale_adv_obj.amount,
@@ -181,4 +181,4 @@ class sale_open_invoice(osv.osv_memory):
 
 sale_open_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index be74ac94ac9..3257d1aafe8 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -6,17 +6,17 @@
             <field name="model">sale.advance.payment.inv</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <form string="Partial Invoice">
-                <field name="product_id"/>
-                <newline />
-                <field name="qtty"/>
-                <field name="amount"/>
-                <newline />
-                 <separator string="" colspan="4"/>
-                 <label string=""  colspan="2" />
-                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                   <button name="create_invoices" string="Create Partial Invoice" type="object" icon="gtk-ok"/>
-             </form>
+                <form string="Partial Invoice">
+                    <field name="product_id"/>
+                    <newline />
+                    <field name="qtty"/>
+                    <field name="amount"/>
+                    <newline />
+                    <separator string="" colspan="4"/>
+                    <label string=""  colspan="2" />
+					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+					<button name="create_invoices" string="Create Partial Invoice" type="object" icon="gtk-ok"/>
+                </form>
             </field>
         </record>
 
@@ -34,15 +34,15 @@
             <field name="model">sale.open.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <form string="Invoices">
-                 <label string="You invoice has been successfully created!" />
-                  <newline />
-                 <separator string="" colspan="4"/>
-                 <group colspan="4">
-                  <button special="cancel" string="Close" icon="gtk-cancel"/>
-                   <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
-                   </group>
-             </form>
+	            <form string="Invoices">
+		            <label string="You invoice has been successfully created!" />
+                    <newline />
+                    <separator string="" colspan="4"/>
+		            <group colspan="4">
+		                <button special="cancel" string="Close" icon="gtk-cancel"/>
+		                <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
+		            </group>
+	             </form>
             </field>
         </record>
 
@@ -55,4 +55,4 @@
             <field name="target">new</field>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 610184b0e71..83fa1ea583a 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -102,4 +102,4 @@
         </record>
         
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index 45942986cb0..37fcbc18ea9 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 9835e066d29..d05cb581ae4 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:30+0000\n"
+"PO-Revision-Date: 2010-08-18 13:16+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 70539604361..be5648330d6 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:24+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index bc017a07a52..ecde2b77c08 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:16+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 3d0e80665e0..87b5b5bc25d 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:24+0000\n"
+"PO-Revision-Date: 2010-08-18 13:08+0000\n"
 "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 9f68440f9b1..97886df994a 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:36+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 449763a14fc..d1a0b88cf86 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:31+0000\n"
+"PO-Revision-Date: 2010-08-18 13:12+0000\n"
 "Last-Translator: Renato Lima - http://www.akretion.com "
 "<renatonlima@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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index ed56a2399f6..1881946505f 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 08:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:19+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index aa4981ac545..f81de1c5faf 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -620,7 +620,7 @@
                                             <separator colspan="4" string="Move Information"/>
                                             <field name="location_id" domain="[('usage','=','internal')]"/>
                                             <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)" select="1"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
                                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1927,7 +1927,7 @@
         <menuitem
             action="action_stock_journal_form"
             id="menu_action_stock_journal_form"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
             parent="menu_warehouse_config" />
 
     </data>
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index 5df4f18f771..cb34ce47df0 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-08-18 13:08+0000\n"
+"Last-Translator: vra (openerp) <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 25dc2c8a539..06410910d08 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:46+0000\n"
+"PO-Revision-Date: 2010-08-18 13:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index 3e065ba9abe..6574d1c560f 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:19+0000\n"
+"PO-Revision-Date: 2010-08-18 13:12+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 0c52369a772..84cd0eed7ea 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:25+0000\n"
+"PO-Revision-Date: 2010-08-18 13:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 06:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index d3789442b4f..d65515337e9 100644
--- a/addons/thunderbird/plugin/openerp_plugin.xpi
+++ b/addons/thunderbird/plugin/openerp_plugin.xpi
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 85e4deabccb..e28fb93339b 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
index 4a7eb7c94e1..073b323d077 100755
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
@@ -1351,23 +1351,6 @@ function dictcontact(a,b){
 	return temp;
 }
 
-//function to create the xmlrpc supported variables for xmlrpc request
-function dictcontact(a,b){
-	var temp = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-	for(i=0;i<a.length;i++){
-		var strkey = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strkey.data = a[i]
-		var strvalue = xmlRpcClient.createType(xmlRpcClient.STRING,{});
-		strvalue.data = b[i]
-		var test = xmlRpcClient.createType(xmlRpcClient.ARRAY,{});
-		test.AppendElement(strkey);
-		test.AppendElement(strvalue);
-		temp.AppendElement(test);
-	}
-	return temp;
-}
-
-
 //xmlrpc request handler for creating the record of mail
 var listArchiveHandler = {
 	onResult: function(client, context, result) {
@@ -1418,7 +1401,7 @@ function upload_archivemail()
     list_documents = document.getElementById('listSearchBox')
     var context = []
     var cnt = list_documents.selectedCount
-    var ref_ids = [];
+    var ref_ids = "";
     var branchobj = getPref();
 	setServerService('xmlrpc/object');
 	netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
@@ -1439,7 +1422,10 @@ function upload_archivemail()
 	{	
         var object = list_documents.getSelectedItem(i);
 		var eml_string = parse_eml();
-        ref_ids[i] = object.label + ',' + object.value;
+        ref_ids += object.label;
+        ref_ids += ",";
+        ref_ids += object.value;
+        if (i < cnt-1){ref_ids += ";";}
 		
     }
     var a = ['ref_ids','message'];
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index a90592c3fca..ba86c85cb65 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:41+0000\n"
+"PO-Revision-Date: 2010-08-18 13:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index 85af924cd9d..7eba57a241c 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-16 09:45+0000\n"
+"PO-Revision-Date: 2010-08-18 13:21+0000\n"
 "Last-Translator: adsiz_1029@hotmail.com <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-08-17 07:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki