From 12381be01045d64498616f3f2697f0162edbe0c1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 23 Mar 2012 15:00:13 +0530
Subject: [PATCH 01/90] [FIX] account_voucher: remove pay button if state is
 posted.

bzr revid: tpa@tinyerp.com-20120323093013-3x546uunrbe5t0nc
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 4e0cdb582954158481b5ec379e959c22a981ee5b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 23 Mar 2012 17:09:25 +0530
Subject: [PATCH 02/90] [FIX] account_voucher: remove pay button if payment is
 done

bzr revid: tpa@tinyerp.com-20120323113925-hftkypiln1rn7mlk
---
 addons/account_voucher/account_voucher.py              | 6 +++---
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 54226166508..8d7fa798c4a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -46,10 +46,10 @@ class account_voucher(osv.osv):
     def _check_paid(self, cr, uid, ids, name, args, context=None):
         res = {}
         for voucher in self.browse(cr, uid, ids, context=context):
-            ok = True
+            ok = False
             for line in voucher.move_ids:
-                if (line.account_id.type, 'in', ('receivable', 'payable')) and not line.reconcile_id:
-                    ok = False
+                if (line.account_id.type, 'in', ('receivable', 'payable')) and line.reconcile_id:
+                    ok = True
             res[voucher.id] = ok
         return res
 
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5b3965ad59b..0cb3104f92e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -153,7 +153,7 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <group attrs="{'invisible':['|', ('state','=','posted'), ('paid','=',True)]}">
+                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
                            <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>

From f5cad0242de49dd4b9010674b147d3d330180442 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 27 Mar 2012 11:23:45 +0200
Subject: [PATCH 03/90] [imp] desactivated rng check for views

bzr revid: nicolas.vanhoren@openerp.com-20120327092345-06bhhik1suy3td6p
---
 openerp/addons/base/ir/ir_ui_view.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 8fcb794b08e..00a485e8ec1 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -89,7 +89,8 @@ class view(osv.osv):
         return True
 
     _constraints = [
-        (_check_xml, 'Invalid XML for View Architecture!', ['arch'])
+        # desactivate to test the new form views
+        #(_check_xml, 'Invalid XML for View Architecture!', ['arch'])
     ]
 
     def _auto_init(self, cr, context=None):

From 09b834e2ff36a65035580136da54dfbae999182f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 27 Mar 2012 17:44:54 +0530
Subject: [PATCH 04/90] [FIX] l10n_ch: add default credit and debit account in
 demo data.

bzr revid: tpa@tinyerp.com-20120327121454-gw0rspj8jk0abe47
---
 addons/l10n_ch/journal_data.xml | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index 04870ca936b..7f118c7d9e0 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data noupdate="1">
-        
+
         <record id="expenses_journal" model="account.journal">
             <field name="name">Journal de frais</field>
             <field name="code">EXPF</field>
@@ -8,9 +8,11 @@
             <field name="view_id" ref="account.account_journal_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
+            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field name="entry_posted" eval="True" />
         </record>
-        
+
         <record id="bank_journal" model="account.journal">
             <field name="name">Banque CHF</field>
             <field name="code">BCHF</field>
@@ -18,9 +20,11 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
-        
+
         <record id="bank_euro_journal" model="account.journal">
             <field name="name">Banque EUR</field>
             <field name="code">BEUR</field>
@@ -29,9 +33,11 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
-            <field name="currency" model="res.currency" search="[('name','=','EUR')]" />
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
+            <!-- field name="currency" model="res.currency" search="[('name','=','EUR')]" /-->
         </record>
-        
+
         <record id="petty_cash_journal" model="account.journal">
             <field name="name">Caisse</field>
             <field name="code">CAI</field>
@@ -39,9 +45,11 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
-        
+
         <record id="misc_transaction_journal" model="account.journal">
             <field name="name">Opérations Diverses</field>
             <field name="code">OD</field>
@@ -49,17 +57,21 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
-        
+
         <record model="account.journal" id="bilan_journal">
             <field name="name">Journal d'ouverture</field>
             <field name="code">JO</field>
             <field name="type">situation</field>
             <field name="centralisation">True</field>
             <field name="view_id" ref="account.account_journal_view"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="update_posted" eval="True" />
         </record>
-        
+
     </data>
 </openerp>

From f0a92dfc5a9572d2d73967a8b7b6e9ee7ae98c01 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 27 Mar 2012 16:28:58 +0200
Subject: [PATCH 05/90] [WIP] New Sale Order view

bzr revid: fme@openerp.com-20120327142858-gro32on5kjqr7iwr
---
 addons/sale/sale_view.xml | 111 +++++++++++++++++++++++---------------
 1 file changed, 67 insertions(+), 44 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5cf3781478b..653cc38d6e3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -96,28 +96,44 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
+                <html>
+                <div class="oe_form_status">
+                    <div class="oe_form_status_left oe_left">
+                        <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
+                        <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
+                        <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
+                        <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
+                        <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                        <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
+                        <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
+                        <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                        <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
+                        <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
+                        <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
+                        <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                    </div>
+                    <div class="oe_form_status_right oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                    </div>
+                    <div class="oe_clear"/>
+                </div>
                 <form string="Sales Order">
-                    <group col="6" colspan="4">
-                        <group col="4" colspan="4">
+                    <group col="2">
+                        <group col="2">
+                            <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
+                            <field name="partner_shipping_id" domain="[('partner_id','=',partner_id)]" groups="base.group_extended" options='{"quick_create": false}'/>
+                        </group>
+                        <group col="2">
                             <field name="name"/>
                             <field name="date_order"/>
-                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
-                            <field name="client_order_ref"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <field name="invoiced"/>
-                            <field name="shipped"/>
+                            <field name="payment_term" widget="selection"/>
+                            <field name="pricelist_id" domain="[('type','=','sale')]" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                         </group>
                     </group>
-                    <notebook colspan="5">
-                        <page string="Sales Order">
-                            <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended" options='{"quick_create": false}'/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                            <newline/>
+
+                    <notebook>
+                        <page string="Summary">
                             <field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sales Order Lines">
                                     <notebook>
@@ -187,32 +203,41 @@
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
-                            <newline/>
-                            <group col="13" colspan="10">
-                                <field name="amount_untaxed" sum="Untaxed amount"/>
-                                <field name="amount_tax"/>
-                                <field name="amount_total"/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
-                            </group>
-                            <group col="17" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
-                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                                <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                                <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
-                                <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                                <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                                <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                                <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                                <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
-                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
-                                <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                                <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                                <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                            </group>
+
+                            <div class="oe_right">
+                                <group col="2">
+                                    <field name="amount_untaxed" sum="Untaxed amount"/>
+                                    <field name="amount_tax"/>
+                                    <field name="amount_total"/>
+                                </group>
+                            </div>
+                            <div class="oe_clear"/>
+
+                            <separator colspan="4" string="Notes"/>
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other Information">
+                            <group col="4">
+                                <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
+                                <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
+                                <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                                <newline/>
+                                <newline/>
+                                <group col="13" colspan="10">
+                                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
+                                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
+                                </group>
+                            </group>
+                            <group col="6" colspan="4">
+                                <group col="4" colspan="4">
+                                    <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
+                                    <field name="client_order_ref"/>
+                                </group>
+                                <group col="2" colspan="2">
+                                    <field name="invoiced"/>
+                                    <field name="shipped"/>
+                                </group>
+                            </group>
                             <group colspan="2" col="2" groups="base.group_extended" name="logistics">
                                 <separator string="Logistic" colspan="2"/>
                                 <field name="incoterm" widget="selection"/>
@@ -227,7 +252,6 @@
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Conditions" colspan="2"/>
-                                <field name="payment_term" widget="selection"/>
                                 <field name="fiscal_position" widget="selection"/>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
@@ -236,8 +260,6 @@
                                 <field name="create_date"/>
                                 <field name="date_confirm"/>
                             </group>
-                            <separator colspan="4" string="Notes"/>
-                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="History" groups="base.group_extended">
                             <separator colspan="4" string="Invoices"/>
@@ -247,6 +269,7 @@
                         </page>
                     </notebook>
                 </form>
+                </html>
             </field>
         </record>
 

From e99b876f640591f44b2e68080af623239c3f18dc Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 28 Mar 2012 11:13:30 +0530
Subject: [PATCH 06/90] [IMP] l10n_ch: remove changes of demo data

bzr revid: tpa@tinyerp.com-20120328054330-xyldnm258od1yo3c
---
 addons/l10n_ch/journal_data.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index 7f118c7d9e0..fcefe9e3aff 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -8,8 +8,6 @@
             <field name="view_id" ref="account.account_journal_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field name="entry_posted" eval="True" />
         </record>
 
@@ -20,8 +18,6 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
 
@@ -33,9 +29,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <!-- field name="currency" model="res.currency" search="[('name','=','EUR')]" /-->
+            <field name="currency" model="res.currency" search="[('name','=','EUR')]" />
         </record>
 
         <record id="petty_cash_journal" model="account.journal">
@@ -45,8 +39,6 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
 
@@ -57,8 +49,6 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
 
@@ -68,8 +58,6 @@
             <field name="type">situation</field>
             <field name="centralisation">True</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="update_posted" eval="True" />
         </record>
 

From fc9097988152c0af181f39ca8dfaa3f9b6f27330 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 29 Mar 2012 16:43:07 +0200
Subject: [PATCH 07/90] css part1

bzr revid: al@openerp.com-20120329144307-0chkq7fki61s55qv
---
 addons/delivery/delivery_view.xml |  2 +-
 addons/sale/sale_view.xml         | 35 ++++++++++++++-----------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 2d97d89dfca..4202ff3c7d4 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -313,7 +313,7 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                    <xpath expr="/form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
+                    <xpath expr="//form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
                          <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
                     </xpath>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 653cc38d6e3..d3d798976b5 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -97,29 +97,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <html>
-                <div class="oe_form_status">
-                    <div class="oe_form_status_left oe_left">
-                        <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                        <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                        <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
-                        <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                        <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                        <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                        <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                        <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
-                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                        <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
-                        <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                        <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                        <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                    </div>
-                    <div class="oe_form_status_right oe_right">
+                <div class="oe_form_topbar">
+                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
+                    <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
+                    <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
+                    <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
+                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                    <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
+                    <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                    <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
+                    <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
+                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
+                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                    <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
-                    <div class="oe_clear"/>
                 </div>
                 <form string="Sales Order">
-                    <group col="2">
+                    <group col="2" class="oe_form_header">
                         <group col="2">
                             <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
                             <field name="partner_shipping_id" domain="[('partner_id','=',partner_id)]" groups="base.group_extended" options='{"quick_create": false}'/>

From ecd703dfc9b270398b0991b1538e9d504b9a17c3 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 6 Apr 2012 16:03:39 +0200
Subject: [PATCH 08/90] [FIX] mail new form api

bzr revid: al@openerp.com-20120406140339-43drxzaql75isk1p
---
 addons/mail/static/src/js/mail.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fbe817c2c81..fc6cb833d4b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -58,10 +58,8 @@ openerp.mail = function(session) {
     }
 
     /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add(
-        'Thread', 'openerp.mail.Thread');
-    session.web.page.readonly.add(
-        'Thread', 'openerp.mail.Thread');
+    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
+//    session.web.page.readonly.add( 'Thread', 'openerp.mail.Thread');
 
     /** 
      * ThreadDisplay widget: this widget handles the display of a thread of
@@ -464,15 +462,13 @@ openerp.mail = function(session) {
 
 
     /* Add ThreadView widget to registry */
-    session.web.form.widgets.add(
-        'ThreadView', 'openerp.mail.RecordThread');
-    session.web.page.readonly.add(
-        'ThreadView', 'openerp.mail.RecordThread');
+    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+//    session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread');
 
     /* ThreadView widget: thread of comments */
-    mail.RecordThread = session.web.form.Field.extend({
+    mail.RecordThread = session.web.form.AbstractField.extend({
         // QWeb template to use when rendering the object
-        form_template: 'RecordThread',
+        template: 'RecordThread',
 
         init: function() {
             this._super.apply(this, arguments);

From 53cf28bee7a30c2b81346e0cb9d8756e1564d05c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 03:46:33 +0200
Subject: [PATCH 09/90] fix wiki

bzr revid: al@openerp.com-20120409014633-8ery0ndv4ix71nv7
---
 addons/wiki/static/src/js/wiki.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/wiki/static/src/js/wiki.js b/addons/wiki/static/src/js/wiki.js
index 8d68fed22e6..31442afc3c3 100644
--- a/addons/wiki/static/src/js/wiki.js
+++ b/addons/wiki/static/src/js/wiki.js
@@ -1,8 +1,5 @@
 openerp.wiki = function (openerp) {
-    openerp.web.form.widgets.add(
-        'text_wiki', 'openerp.web.form.FieldText');
-    openerp.web.page.readonly.add(
-        'text_wiki', 'openerp.wiki.FieldWikiReadonly');
+    openerp.web.form.widgets.add( 'text_wiki', 'openerp.web.form.FieldText');
     openerp.wiki = {};
     openerp.wiki.FieldWikiReadonly = openerp.web.page.FieldCharReadonly.extend({
         set_value: function (value) {

From eb550cf9a146d17ad17069fdaaac874220513d59 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 04:04:45 +0200
Subject: [PATCH 10/90] fix2 wiki

bzr revid: al@openerp.com-20120409020445-om7ytt0239s1cwja
---
 addons/wiki/static/src/js/wiki.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/wiki/static/src/js/wiki.js b/addons/wiki/static/src/js/wiki.js
index 31442afc3c3..88bfec6602e 100644
--- a/addons/wiki/static/src/js/wiki.js
+++ b/addons/wiki/static/src/js/wiki.js
@@ -1,5 +1,6 @@
 openerp.wiki = function (openerp) {
     openerp.web.form.widgets.add( 'text_wiki', 'openerp.web.form.FieldText');
+/*
     openerp.wiki = {};
     openerp.wiki.FieldWikiReadonly = openerp.web.page.FieldCharReadonly.extend({
         set_value: function (value) {
@@ -8,4 +9,5 @@ openerp.wiki = function (openerp) {
             return show_value;
         }
     });
+*/
 };

From f7fecf3f367574c1d187fa46f9d5bede93b67007 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 17:22:51 +0200
Subject: [PATCH 11/90] sale hide partner_order_id field

bzr revid: al@openerp.com-20120409152251-didpbt5tklnjahef
---
 addons/sale/sale_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index fd4ee1a02e2..4eae3c5717b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -222,7 +222,9 @@
                         </page>
                         <page string="Other Information">
                             <group col="4">
+                                <!--
                                 <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
+                                -->
                                 <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
                                 <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                                 <newline/>

From 1f4617207dee734fa46513d6ab5f5d792d401dfd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 20:42:48 +0200
Subject: [PATCH 12/90] [FIX] bug on sale order inheritancy/delivery

bzr revid: fp@tinyerp.com-20120409184248-v4o347u67yjg23kt
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 6cf2d19e076..b03d9cd4d79 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -304,7 +304,7 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                    <xpath expr="//form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
+                    <xpath expr="//button[@name='button_dummy']" position="after">
                          <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
                     </xpath>
             </field>

From c7a822532806438a7417922f60308856685de444 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 20:58:19 +0200
Subject: [PATCH 13/90] [FIX] inheritancies sale order

bzr revid: fp@tinyerp.com-20120409185819-nlx7x1pt1e8evvjk
---
 addons/sale_layout/sale_layout_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 146ca8aa006..d43ecdaf4d6 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -12,7 +12,7 @@
             <field name="priority">1000</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='order_line']" position="replace">
+                <xpath expr="//field[@name='order_line']" position="replace">
                     <field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
                             <form string="Order Line">
                                 <notebook>

From edd07014cc73458e3d12329e04ce5833994ad65a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 21:40:43 +0200
Subject: [PATCH 14/90] [IMP] mail groups created by default

bzr revid: fp@tinyerp.com-20120409194043-g281n3s231vy86jm
---
 addons/mail/__openerp__.py                  |   1 +
 addons/mail/mail_data.xml                   |   2 +-
 addons/mail/mail_group_view.xml             |   2 +-
 addons/mail/mail_message_view.xml           |   2 +-
 addons/mail/mail_thread_view.xml            |   2 +-
 addons/mail/static/src/img/groupdefault.png | Bin 19910 -> 3092 bytes
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 88e932299e1..81719794f69 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -66,6 +66,7 @@ The main features are:
         'security/mail_security.xml',
         'security/ir.model.access.csv',
         'mail_data.xml',
+        'mail_group_data.xml',
         'res_users_view.xml',
     ],
     'installable': True,
diff --git a/addons/mail/mail_data.xml b/addons/mail/mail_data.xml
index 964552b951a..c8e8b1a488e 100644
--- a/addons/mail/mail_data.xml
+++ b/addons/mail/mail_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-            <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
+        <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
             <field name="name">Email Queue Manager</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 949dd1cc9b8..ea0dede377d 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -112,6 +112,6 @@
         </record>
 
         <!-- left-side menu: Groups !-->
-        <menuitem id="mail_allgroups" name="All groups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
+        <menuitem id="mail_allgroups" name="All Groups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
     </data>
 </openerp>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 7389f8e5488..ecd106e05e5 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -234,7 +234,7 @@
         <menuitem name="Feeds" id="menu_email_message_all" parent="base.menu_email" action="action_view_all_messages_short" groups="base.group_no_one"/>
 
         <record id="action_mail_all_feeds" model="ir.actions.client">
-            <field name="name">All Feeds</field>
+            <field name="name">Wall</field>
             <field name="tag">mail.all_feeds</field>
             <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
         </record>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index faa6d24ae2c..af0c6cedda1 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -14,7 +14,7 @@
         <!-- left-side menu: Feeds !-->
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
         <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">All Feeds</field>
+          <field name="name">Wall</field>
           <field name="sequence" eval="10"/>
           <field name="action" ref="action_mail_all_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
diff --git a/addons/mail/static/src/img/groupdefault.png b/addons/mail/static/src/img/groupdefault.png
index fd8268372668a04b43448d520ae7cf670d4cd0c7..cf160022470e0f0d1c8928b9364bf99349bbee45 100644
GIT binary patch
literal 3092
zcmX|Dc{mh$7yixICfTD9V=!b(Q<3hN7!27-in2$zlx^%;rfefiw(MC$3uE7zy2;kH
zT<h4f)Jzk?wTFh!eZJ@3^E~f)-}jvV&il`aH8sA@$u7(e0N~Wq#hD#5;UB=D$KB9+
zC-;~jc(d!8fHWYocx+C1>E6KupeXqdAb}<7{>MW$Up*sjwi)IVr#KPSV1^HXlcjn%
z4fDXMl^5<0M8*WV2b%+&+gf*~W`Bz2eDoJl=@Qq2NI^#Vl(kE+CpGouwHcaL^#bhL
zyaJ}To~K+v6k>y<(=0}wOud20@Z$`KQ&1LunTMyoBw=-PKPG;i2nwXAs#ZQSQU5Vj
zEjqnSSsj?#J?gD-c5xY4%fk=;hNmm?@ygJQ4YRNiQ;^0FSg?Bk3fb0SpTA#_R>HPg
zFw?ZQ9Ta=Os8&yP-P`f%r%@=k!quse-se-p%C!JEHw!GROg;}>x`M_-nZ!q#m<dG5
z3X@186^*?Y|JFH;`1m1oUNEu0&Y;rK?|gB-2K(*F_wTB*BUR)=okR@YRMoM+6#NBa
z?bzddfAFAjVz*(tRW<0=HH35prv4^p$mwp?kNAO{wI{8t6lqnpE+N<!@U-pxbfIVy
zAm5g|lsqR`Tlq=GjZ(z`ei=QqbDFgSNlP<Qm&}Ge;)5rNboJG01iruOY1=PM7PLHy
z3xV1n(KP7K4{lu6N%-xMV(N@!L2(fZTkXDV|G9}cxxqzVBkv(ygY)i+=~!R6gw!M)
zCdfP4nZQAkO$;?l5tm*zF2=$tkxW%K8uGN*7X?!H2Id+Z9eNcWZA1`}7_$B2?Ozud
zE0FBREZV4q-0ne+B<}!v>fsK-vJ$gl=M-{#yc!po?V;uq_v{*0zve4yIr?Z1i^E-8
zQCnl_H(usG-xkVc-w^jZJ2sIHWkGnpxPBZ{Cg<cUXwuDu$=%z)9A;()_<<D5ae8JT
zM7F=1qJx70;(I0G8@owZ2`tjC?rz!814@YFkI}p00E?soX6uZe_ZO=-wTvT5rBUpK
zMR&YJBjcJ~us9dvZzl<x5y7r(7xzqLlb4xcv9%NRG58mKBZm6Sgyg{y*nsGL!-&#)
z#a{keYX_{P>6WXNEkFRQ4iU?TVbg;G$dk#q_WX+;*dtk1&_h^e{+I-D(Xw%x=hiVR
z;IBKn71~R&Dg6VmDzjN%{WHd(SzPL|sCJ4BCI!yUU34zfCBk<oQNm{)-7LNI7<mq<
z>D0lxUEqE3cQ+((%H>)a&LMdV8HAcbbbHnO707hQ6#h9z9v<}t(pU^*CUJhy!C^Uh
z0MFJuERH*owq6knB8g^Z6gb(w{%?ic5xAEJWv)UiKQ*n)E<}ik!zdb^g5m7MG`ufW
zy(HHll+D?SJ~5wHLo<Q8{Y=qQ*&2IIJNK7BOBf@K@<``yZ0dBLeIa5AEzR^;a5m?D
z`~vZ6;)wBV^d*pDuU-A>35vV;FDeKjJ4gnt_MU6NOO|WvC*!fB`f)df64FqsOM`|S
zCODrj6X8z<D6oY-Gj0@j*wjJU8T4wi$%QzeQAHLa5Lm}K=)t|>UwqT0e!>ZUKYkXj
zF?wcND+@}4-+xi^qK653!s2rUo1}e0uS6G^kasv68!htBtkXp@axH$y;Ej3>e1^|w
zr5g<^eKp3k^{*^0L`9MNQ7J5tjTw$m9CEr3LHL>XYzXz9a^W^YBFp8k+6|u*PQrjb
zJJHM0an$%YvvmON%m+rcLj-k*9OZaji33G~)6RV!tSu3isS_${*px)0c=gmn)hE;_
z5Ck8OkE56IfGs=ohs)$PwFt05?Nr3ER(nJ%Y`2L&sy(U-h`kKnzp4<OoL+Yq$<|l#
zL_3NRFz3FmoyZ7ZcJ`SG`8#41lN-g8HuXs}(6YL~Ym?Lmh1vMTqP`w_dh<e5UbQAL
zIr+nl@66#}SDyRH=)PpjmPWFX+~1rRXr*GxSyC!H%)Wi#lF%P?7)vO8H2W<<zBGJl
zs~zFQv4LdnY!OmvlT|6{c5mbn2YPz`>Xq*2XEw$SZ32QpeZXh$rL4Icdla|yy)3n$
zvuoZgAYqL1P1p_Xb1fwNpwAW`4BDD3*^|#~LyNXhMal}gYQimu8MiOrZ3QoT<0eOJ
zf2H(oD3`IB*7)}i<sVwh%WW_)hSsSsKFi;Q@AX@Df4ri|b{XB3ren&pq4v2#x$@Ju
z`(<L2!9hXm8KjMH<)n}+-F55HUVo>vy-XFnro-z{W%+BZU%}2l7_j)&|M9Ie$SkpB
zbN9a8`I$C@uEE5b8#X>%vQK|<5qxcYKL7As%Mf2@F&Ki`W>Ul@PDlQrukMHfIJ<yN
zSXTT&yGSv0<MW9?w}tWWn;J<kMWoslpH5W%`eX+HRz9cOfI<GsC!s&hRp0RP9X)7M
zD*!VnF-Eo2qBBX{v&P$oE4_s`|2|T>#TM1U5DWR9x3pey>g6YMBhR3{y%Pzo!}_=1
z#g8fMs0DMznsW1S{-E^;emtlvu{e<8WFcS~ny0xU(ncmTq-q&L0~L}nR<>c@d;#RZ
zl7>L3^xF}W8G-Yy<qcd)Ohi-t-52Ur`}g<X<ox1$0tmlnt84M_iaQR(lDfLZass|`
zrZSqmJNvt)tUiQeI;|>CpW{k>nBtx+<TrQN9-rT@L(MI?!(DDA_GmZM?plGmSgUB+
zFV*F<4YR5Y{L_I51cp8qGt-ziqWDhSmwqw~VlTFK)oTRZxa*s!(k=ic_H6d}F~tdA
z6hu<2c4pN#nv}9+USSECWc+eWx?NGm^K~!FkNfUdJWz7-346*(gV{2mxF{sPz3Xzy
z4d_r*zeAR;!bHt$*G`{I?QC4=fku$%1-ZUa+*24)0?wwlx(Kg87HRA2ayepgeJDl7
zgSiJ#RBT-hEx{tzwbZAukjBju>#8sm*5okV5tla`CNSxz-fEB;%L^wEhimv^)bfkr
z0En578aWiM&abCE7%_lGw^bzxGA%69XeZaE`CRWhncsSmzo}{>GFx@=a40;fn%C}}
zf;+9Z7|)O0O>}uS6WnTR^L$4IM6c|wwhV7NVQhUTO9(w5v~_OXqVBtERh(hVIrA(l
zz|R*>-tMm6^{>SO<uLLLt&J-0o}CvKQq#B;^g7?bA^!55d0OhKH++8~I!|;^*smTz
z`%WTYHB;!Zmg>!lOLwXJ%kfM473B|R`&A?y3)7`e{Zf3(_`Z1NC}g!#wfHF5LSFU{
zEP|$|*>~`bGhrH@-J_QXzsC10C-JN0?WJq_U6xlx(tY~QUQkqocPr%9?rpl`Spndh
zJ4_w84wsRsq(wz(N!HaVBvEtG0<LZf<c+7p%OvGDZwb}&U!;p$+&*Qv);C^1+Dn|=
z(c8VO+UCliN<zHe%C4_awKKS>4!_Eiu;V@8&@(b$*Qih;qH?_hTVP*~cg^k+w5oGW
zE?vxmCYjU6*`9gMUiw*}bJw~5;n~0&feY<9dis5YX9m;K-9l*oAQ`2B^@H6t1EfOk
z?Alm-s#<(yN=iy;X{QkLeE7=TT)Hl@#ttJL)JhteX+!eG_E`#N+g&mm5n585%(dW+
z)ukka9;oH@q7m;#KYymRc#wk6>9PJ{UsYS{m<a9JGZ{xnNbGEH_ul}Ag3Ot^NPdE~
z+{46T;AE;vY-x!*w$X@WkF0oTlA|nOCqN5c0vVwHk5JlFu6h%RzZ2C=x@loi243;J
z{QnNi#aH+n2Z4wv%aJpXb$4_7rbvj6?y|2!S;Tpyyv;l-EKK)>vB$(oTXOa{EkX)P
zoev{FMcrvbodjrfqL`|GA1a>eHnVsk`E0}YOxIBtTTSBlc*%m7B}DgiJ45&S^%w_1
zy=kL|?L54kPejt_LFdn(QBCX&TC$O(Y|F{XN#8&XvVaI5n=@eRwFleG__*_(j&XDg
zsnu=F?Rm7Zc?)TIWFo$~zTQvwX~`17`c+dCa#2T*BNsp2P=^1|EbzqH_1+p$=fH5p
zaDXk3USZv=59w*xS^az}t~2G-qdSvr(b3xMSgz5rF{#M!OXwTNWj9v<sQIJF@_#S%
g->Lo+X;KWa(}sAS4@&tO$4@-a(>BJDH0_`K4;9m}?EnA(

literal 19910
zcmXtg2RN4f`@ZcV@nk-)?42H~BxFAJ$jaU$BgslO$sU=7vS-NNBxK7738`e2Eqkxu
z<@-PW_i;oy-q&;ApU?HVuJbz2^SUE6)D*4~(-LE0VO>>Hl+}Xo3-ISB0tdeCuX$&}
zH|(cc3K*=iFLcZB4<ctpgQr+nS12z3U}L4Eq2PyvZc6v%2!G+yUB$y+dMp1E3yTR$
zNmg3hGi}|^!<X{e@rA8T|C+<}eP-t9U3o=j<`>9#4tu1ywiuQ8&`yd+hMC{;#ur!5
zeebk0v}ZV#c4rLBnT8l19zK;S6H*x?^s|5M%i5QX*t;i3Wkj<#Z57+RF0h+YCns+V
ziDedi%v`j1Xu#1yCyXCz;eBy~I_h)P06$58)h<PnwY33hSVu52W`2prsuH#Ts-gJH
z|E{{aI$T0hVLH<KpX+<xGTCtxt5kSxi#v@|j<G!y2s}LLaQR%ip4lk-TEl|T<vs6a
z(;=6%L7UsDgEwy6P*PHIZxX+A=ME3gpna{4jZKOwM^slJMTC5=eQgSoJX(HPX+);I
zQ8rgoDWS%YM_kQUE!H3*Papkm#10j@yn4>C<9hYVu9tELX{A1zJfgR%WW?^9{WC#Y
zYXhOJcjOr7R_2z712iQuJ`Q$RN2SNcZ*iaf8o2A4nzhO5g5u)-)xF3Z1h!U@HoCvt
zQsCo#ybgZuMCE*~StUih{wnw@rJO^OXPXYU4w|~!uylEOd2({Hv9U4#f7gHi{RiK7
zKRz^gw@6ML;+atpHds|6pW9ZB2xL-9P%8);roenOE&u#bbm6a-totyMG|bvSw@AC;
z>8{NCbp-Q>-D`V|Uux1wF@~YpjxdjZzZzZUyUSaS-#0f;t-CiF^ZMr3yJ74e8g!R=
zX7oHJb_hLtkRSfs+F;zicK1&6f@koO#0^2(=t+k!{r$z|mlq!&-_XE7jXv72G>Q9%
z2G>J=)TYd=voLj(rY0#tP!;+*34u3Bb9VR|6Dw^raiEk=44V>dG=Ya+zScF2Wu-nB
zC2?3sdGr2{e^X787pFT;t!Lxw?xR=nq(7B?gPkl5{lXEv<R<!S%1$s+-J5k}6L#6N
zpI<eH>)?9^Ln1ssMt$xWWrKAVhs+tVtE#S!ij0(xp%d{t-i?fmtg5=@D^5o`zqqOR
zX|1iEB|e-95t&5q>MWXWQ~louo~=-9iOlli;>QzZCKu-it$HQ;l}~;OMaxq}$a<@g
z*U}V8EO=$i3%~c+(o3>t9_4tYlsf|V6V&!;=c8J|sGT6XKQc%0fHl$*LNlx*fsJ0m
zS3iMGld`gJzC40}pvT3qRERoCT47GlTtt>7zLN*`*WdsAQ9-(pb>Hhss~&1<YOVYj
zGj(HUN}hYNFMgJfE+d#L^-G$XeD+qx%$}d^6=eD!kLj5`d-iNENi$}iNi-Ols7ys1
zk~M4YW-mzFH04;S-yO^7RR8n#ty{Nl-yZ$?H6bCPMEB;<j@XdQjrQQB)lUx%LT`7v
zq)l&lh^CW<<rZIF{j<)8zAa}b2aKX_h57l`7w2c%qX(h#xg&Ohhm9IsY)a$<M74${
zCMM#JzZ#-=KXBc<caM{k@aKuIM4DC3AqVE#q;wFQl162`V&|;0!_T_)bdTQ#)i(FZ
zhyv8*5wpUi)Hr7p9sJ(SEro?#e0=5a-o1POo?B8<l85K2sV@^!qj)UhpU7#pKDxUz
zo~!CmbK!)E=$ug%M=I&B23N2j0nUq<m>82LcfYf}iS_mMRG}x^N4~tt{Tm0I5>64Z
zZ(;v;unu@7B`<bI)g|X&-lnCcg&0^?r`!2(gXP{E1Rjo2orA##x8?1>{YFMc%YAD1
zWfW0#^uAq=^~tYaYwPLh>FUP(cbkKg)3!7Gnsyx%VTHn@UZPulRSsn7DNC9b((0#l
z<&R1t{ja#juKUQ&IoEI}_RTu`o~+m3b6-1LDK2k0-R^g4IeORBl-kMID*O0FpMXER
zxVYcfJS7?vw~^(7Oh=*ASg#Sv_;vLe(_190N(pRA`fbaZr~a*N=H>?Dt9x)5cg!x1
zCyw`4A#>cnTsk2ZRVi6=$VGw%T3T9ia$N&&Zx_FR|Gv0*-TlNo;~|}&$@2!6VC4Hm
z*cCE5;mtNeMu({n&qm+f4<n_|xh^x0Y1<Lwi_BqDLifMR%NxiLKS@yGeJkw3!pw$5
zFue>2R~Dv&1Q9WW`ZfNWkb;C@&)e^L#(wOlI0}Om4EwQ`f2&!kZpRze;F|jS*0cSe
ze66S3wwZqN2nz$<f>F6#P4t1AO6zp_h#mLMo3>xlyt@CheVvqKh^EdQBJ84wmJe!U
zijLW{-br_$dp_GehxJs1JOU2~`_<>*2R|Y7!x;S!w|W>ie$?JXk+6JMXkjD>6;@8r
z*3{feojzUo^>paInp$YWzkmPKl$BY6;e@^VENc}Q_l(x#LGhT38e_i<3I7y?c1vfN
z+kf!vt9K@hU%h>+^h7pyq;O(&8LG*+Isco%1-PD{t(vJ7JV^R0#Wb_$JzJ##x&94t
zP?SDn)^(;eDM{&)t4b6GNv!d`bx(dKp$%?59xv(ZQ|8hPzPBV(s9U_X`O~59W?6$}
zN9fhVvZ2M?3A|+5HezC>g!b7@jRxfilyCgHU$JE+s`+&STL^|(8fohFH?ew1;(BsM
z_rR-Hua>KA1!<qUx_%K|ErDgM%gtroVi=uv6{gG9;L>CYV5qle8cFW`+M|<X-D&4T
z=bl3shG8~Hx+f}1&1Wj+v+p1r6O3#&C1dX1YoiTGT<oGT+dVluq;ARZRNSrQiVP>p
z_;}Mf2Sv_uJz6G#EpsSrXbY2&clqS(?CjwQTG;vJI^1L7*H~?aGMYWN=DvJU`(VV6
z?LGYn9%H7B<dX;kp<jdpnaLGqYPpfWuCo-Hlv9oe0*rNbf*&k8LZkRvP_)Sez2EHb
z4DBG;C@|YQJ2bq;;pOI%4fx^gqh^d++uURydgr=llt&cr={7qHpAOs}die06R4Hw=
zd~e~DW7uNe#OmtGimB&p2*eY40u2cP?hCB3;Y$61#T{v9m+Nth!Fi;99a!UDWIhDp
zvMkzHRT6^7aGh{p1pHhl#lz8vJDBn?v$A64rN5KO)Z@8!pJP;pO#IK5r}wEWS<u5J
z^G!J+O;hHQ^z`&t@%`^_1gub@0w@w~{b!=|I%N+E)J*Ce-kzR4%QQ919O6Xah>;%`
zSeg21QbM>U^-8z7$Wmiuln}cC6q!nzl*`@X?$;4`h04FHto!+%AE_LgDz3MGz4KO8
zC^Z_Hkdop(Bz{0A;oDGL9QBVGMM4@<@PRNivKM0tp@d5&#&6M%_hD&1q|H2FCp9tg
z+35Yd>pyC*n9<;2A9QaV%+Fcwsh$!AYyZW2PO5zH=Evh17dj)Mkv(h+EGKrQoXoHe
z3$exBoAHWyVIs07Lx3oZoSLbKOqH+75YyJ_y1VZ~YCG7N=IeJAq`iuVgX??8AEEZ4
zSDqza_KAXt$@}kx9G*LacY9v`hpRNUy4Tx+vx&;^TKLa5oj1zOiTD`D?-o3`X?=Zt
zxqhYPuLhS*>qlD27AUTnt@)nT^W#-S8oQ~*F={x>R)b&4Pza82khHzi?2i$-^;D-8
zk;Sy9OzDC~R)VzI1hm($XZrjT@s18`W7-q(=F-M*mYzgpYlNH1be{kA*=SaJ#WC`X
zMB=}z(dkdWh!B!7yte-D9Zs`HMBu&60#>q@y$m9*czk%$0X1IDrd)c-{m)iQ>)SE+
z@89q0QdU-O=d|jH>6(vOWr&a^?+|Eyf`#8BZ7B$~8G^musNPY|@uhctg$r}j-CxeQ
z&AtAujFz+!vZwwR<|e1Fc&j|K{(258tML<E-V2l>JiJ1akTJ-rD~*d8JKoK1lKcxx
ztPBV|^7X6mo6*d&SIa5SWdv#WJjDW;pnm78B&($e5=AC0*i_CXCMNP2H^lwuiPKwi
z)_6JfVz`PSwrAN*K37vL8H#JuMoX&bGj7*d!SN@xhEVu*b;omKC6v!zN-@RRU1dFx
zp=n~C!(6qViDXa7*sYyd4WY!~(UbOckV&Scrd}zP-iXpI9<#4aHuLu~GD=O0b63*l
z!i|6jiTHgJa|Wp8zPkEd6p0{HK-f<QAv4G~p8tH%$2nZ0>1wk26kTq}pa&g@O5t>4
zwc!Rq<WE-H)h*Am)^qQb6OMPxU%!5(<}qaJubNn0|MxG6P|2RK_bkV&Nb-CumQ8IU
zpaSQ%?HA)l*Zk8nEPF1>ZBH@rcARkgt4ZsUzS1)0+VpN79vycP1VP$|S+bI6yQ4cp
zl9}?IMcwSdr`yS`om~aIeOU8(QRrI2@p3as$6vzs+?vW3unKTqgKv)Ml`$#@z9$wb
z6QS&wxsWwm;LyQ~5XB)t{R?DMf>UMe?=RtiyF_#N@bBNhjDEZEX-IjL;%;j1+>+Jw
z;?tSh{=X@b&n1jCgW9BM=rb0}KW_Im`yBLDp%FOGzEP5}WZ@TLkAMBT{d4*}Ntx%b
z{g3tilZ{qM7oSEwl5@6f$y#(Y(ePRTx?ceh<HpCG8IxHDk(k@G(Ez?*zmmQqy`fqk
zh)tmFfc{O1N%~t>R`zUl9AG%}cDUAkyf3M#sp)FAWLL85c_vzy)Z;^HWv7V)E9}R(
zo2JxmIDh{9Ig3giFbe=H-sCG+#4UNxJlTlPAG5s+rw}11EiIM2I2zKFQzhqjU;CbZ
z&!ca;;07sKe7;aIy5F(hh_Xvv;)w0e9SDH0ltOCTBMOY`()w*4u`-m}{N_vdon>T=
zFUy%T<in0nGF<c?<933)CLgq89!RLw?JukIL|H-Hj@a#f=FAKhz!IPru*74|tEzH6
z*<Y_hUkQwBNYOB0Oc8sTNeeYh;LQBjyE~7^1L}i+5U#vEooBp=o4@6(wP7WxKoS?*
zvR?O-d=jVPS9!x+WJeeorz0AH(bJ>JFz*sVX=Me=XAaRon*7}rH9kJx&)f8}v&bEm
zF&xLlW9k{Mv%?ujRhC{@$LwUaEvs9I4(?b5{G5iJu)QazB?aBDIMit=z)pB?X(=k7
ziiCiIVj*7f&&KnMd-)@qVq`(H?N|83CXdq3zg3Zj%|lIL3l6wLa-vf{(Rw%+RfXoH
z{%js`O-?|7H49ZGLs)nV^P4$7BULfyiIdaCOc2?UVV?_K+S=_QvD=!Ad-u+-$KQYX
zF=sIUa-o~vy$hx8WF|~aPj9yBA*J1+C9c&aKBjT5qWCN*nqKzdgD8rG<HOBfgZ+NK
zjEdg&IlKdsN|O4Yet&x76B5X|^z_Su<GQ=M;lcm?bF|OX^3qWZDj*kf_^zR;DSbwr
z4xPd>q{bUGk-B#dR5n*zN2<Q1%X-EAT+g^=O?<y2Fh$(DkMih5B%~9SWLce|ym@j4
zu$yTrr-`A{W93`XC8Ar-KF<kBtLW9jkDxIvPnNI{-1a_RE@(0?>r{A8h_5zMRX{>Y
zFB(jvR<N^HJw&kamf-H{>MA`cq0kZ^ru})YwWc9G0uS21*Eb$0e#~ZMDDUo;w|fv5
zRG9a*O4?wnMvZ3}D}QKF#+tOpC4A!j*vjWuoB+<Qv=8$=?7GnEpPPPr+m=NlORGp~
z=dI{7`yAJ2!gS&}rG8YlH&NpO1acD<B2O2jy1wq}%gA)Zvnm|-??_n0@12}EpDlbz
zFP>PHF2Yl{-2U^quwFjG-ExDPSk6>kAYhf}`NbEt46(Na$l)BD<K1QGP|N}eF076B
zlZ+gt8EMG*Zl_83eMr;bz~W%04rI{Q!!JN-XmRx4lAlvd__OB?z<5|VbGvhK;O$dY
z9`_vKj9$!np$8*zNL<^=>CTV~(oWAtkoM-yn^dMzfwG6b5?ptFcw8$T9iEU;n_*5X
zG#a;k^*px6iXWAx#yM94g{f1j2#AN{WAD!2r~Z=6Y}8SHhqGbg93O8SMs%3-`<`y~
zgoK2+e$;tlYr6=z-3$QD__!`6T(?+`!Z=-xGgI-E)!6j;e!bN>_JAT=<%gywg_o#n
zQC<7%KRteXEk1L1$6QcgzS-|3@fbnlHq5VZ%@{v`EAr8!M{sa9T29K;3Zi6LxD&a_
zBY;Ebd3cM8hUR*-yc@Tq#aodWf_L<YqJ4tDAxP-<0%=r|&@U!aP#s!XSW@LW8n#^5
zv+L^iCv7w3BAF?P(+e$z3wl|E|GGE*^^}{SP#2TFY%;d6GZvki_jFSfbY*p=S-4!(
zlm1GcEvsukw3tv!7u`EMm<|)li@xE{bWCZmMk@L8--2D6)ExWNVulazU=Kl1n^j*i
zOQ)nkfOQm3w;~%(WF|a*B&GOG2>v+K!o`cF(IhIlYq|6vK782qK7+^`eggDBB^sbm
zt@oaNp%LJlN`3ECR@Z6Vk5p;fpVC}EY7}Whvs>PJE}HVbaBM|`>yK;Wu6Og8{T&nu
zr{KSLL*dxuj{dEZ?CgJI?)?+?++^x*-xOnvmQUs}3e9v8O^3|e++&5ijlAxWYtA(5
z+NjM<h3=l4v;6Ux>hUulpA%SdiIcTz08<n{)<-7oY80b874olPWHo`{xFiEA%&`en
zEouKkR|y9(np?<uBv#}_Vb6DIe91eX2+R$HkO(9Ox=qIq%N!U*ew3=Ra-@7N6e&#=
zmHw5nV$GDO&pwLF6c`P>5ubX6g6$FMU^eM*n<@v>&o8oN!V14OFXcq7tgI-0G@{Vd
zE()9v{2~P~=d6p*UsFdXf5Z;rrPh#VXs17!kBlIwKZ&Qq^EN6IB{rViXXRs*_RY7>
zuv8tYE_6|fhzMC0``RBi)h15|?*J@OX#Ms0T^bHPrQ5o-0re}!sHmuo539U+&aCl>
z{;DRAjq|xEK0_m;dZ%f%mR93~J7Sy96K^uJRc2xxOLT~guI?48x9<OV3|FNe8~L($
zip~oh;#$M#w?d-nF&1yk`4th5935LW+pkngGa=0l+yT?JnL7`r-0|68lh)>@B$n=C
z7*#knTUX@4tN2fq17Ppew~-NONn1p`cb6WQHz&;tZ(0{c(g(cK<ELxmC!uAJKa?eS
zN!tLO<`bdRF3X56OMY?*fE7@8;Xx_Q@>qYzK0(d2>Z1u#gSe-rnmi=;zgyAuj6{5c
z63A$s%K0T&xN))6+!N;%`$uMaXF4OB>qgUtL~Kv)#A^1{ddI0g{(<^w|0b7td8Guq
zjI}p)Z6o2>B__VXzbDDWHl@%K{P#<B0m3#84h{;F{$R-X(R*kNkIwxBKIVmn=jxvK
z^PSXbZ5^Gq*ssfO5}8h`<E8P651}c9dT!2&#B3%q98PC%9r~lGcaD6grltVMq#2gV
zBY0?|zhp{Iue(1Mqz#^|ur{03$0tTGzu8nowE2p4UWLvv(2TF;(2|R?eN`V_=lWN<
z*>w8%?-+g_60=}kp8$53)F2C#G*UmQcGAJ_hJF1{X}*vDKCA-eQ|W;sW0TNg@cFOg
z^CofVE$FGJUUq8!qmAaEBTY_B98AAQbN=7?2k*U=-QC@**M-);S9aLf5&)17=LozS
zf?;#?l9F?pZaIS%&m6VT8_x>B)3M&nZA9+1d6raLEKrm{@>x%sovr9W2rPQ(ze&C8
z<StA{8*MY+9gP@eI9aV}z4H4h-2qf*H+T2BQm#nJlgXiBe$z?=s#DKTVj)zQ_3G~3
zyH@NI%Wl~kOZ|MUf+&(Eh@DC+g*o#>*$N=bXrnPfp&b^nJv-a|d{5~(`>RaL$?$L{
zOg!ivEZBv!W_o1uwY<a_R!FCuJFYta&DOo^_-kqBh=ia6j@?OQW)&L)!IiKMx}N6k
zzMJ1!m+)XK0Y6rRL|9gHFOhAE#nw*EZwU$ts%A>0BgrFVvsmsr{T8$A46mybqJ6iH
zt((9mSc1E}0MrCv>l`kYp_7T$^E=d07Pwv98k_Tw!V4eZZFBqjVZw(Ntxz^Vxdbw?
zv9p&N)suD^iaUQxN@P<i)qM{2f`^AkTQm0h-LjUJ->Z9b6l|`93!Ri{?*rnA<O2*#
zp`E>C_YSw_AKjgUFkk;!4=e)^9`yIzcYotvxk8m!x|sR=w@vktuLK)US<CT?KH8?%
z@EXIYeQl&j@r*(ssTC$Ca?z`LQtau1YJ;_NR|^0lDJFA%)cH>41^g0RcL!lQK!!kg
zmV0F^3OfQEU240JAPVa^6p*v0Iz<5!LTNS6^IdP&x#8o-kGZ)rrMiy=Q#7~)VO?Yk
zZN8*U4i8JU@*;4e)COU{kGB7^slhWo`cd<!5K+)IEgP?gFG(vn7F$o!VOML|Y#M8t
zndMS6wgLq)W*!xK^si|H!Mr3Cd{rNV=y9>HJ<d-y#c+B;ev6#@)%aBNBqR_YxNwa|
z2o$N+Yy#~6@S^2&N0&b-21~)6z_PFoeegMO6dVk=HlP(4^>f{{)n6P>1mc^MQ$1ZY
zvC5R|%p9q%(^iDn_bB^~=(80F;cHHb){Uj5JV*po5p(_qubqX?fty!mr)nO(>X;Qi
zzSggnDFMtfOL7#kQV!(+*Al0Oj^dp%HjoRHKr9G1&R(|l@wrEAF<xRIW4qW_HNe7C
z2USbCK&N=DP_*EMeyD{;|2^S?!kKS4e-ity^Ju3DJ)w;tq%iLSj=y^HqsNA+r_J{_
zIz`&h4^Cg4-_0KYdhF#;?tly?oGY^8G2yZxRhsD1Y-h1HcldnGqfsd4b`JJK8RFqr
zQPJ|+q0BdcVFt<>2z#YHJ8y4qX=!ORwaQD>aNcG>W>(+>iU?`kL}m6!O9O-dyh&jB
z4U(Fgn&dR0VzMg4obLa0dQ>S~tW^ZG*20!2a0F{V0E6eU(>px$oi^tOCF45*@iBgL
z6MegO^Gx6s1arJ%@S>MAGVZ@k?`DQr+nyNuaO+Bv4qspqc2m*)3xEFX%IRol&9Gs+
zKeDi3{*CeZFy&|mA@*ZxDtZvs1iC%-IqJ~Q4|8PVDY;Pm<~oe`+|j6Meg)vNh9hJW
z^7i-LeS4J?f>n9N8oqtg=3XYIBw=Gy;^yV8`?>zjdSz)ziqG00iHuQVZRbco$y%I2
zT|t5H>e#~KB4`R-gIfHXacmLu4Qp!-v~OHR(`&AV4K3bt{S$6jYNI(EZjNGpxVtpM
z#=x$TWzO^hg|nuG=Ln(^fLjNZq`#mfAu->9SGIT@e&ej&oS`W&lVMmS6sh&#feb?0
zQ8mfBeB!1Oc_BhUj{1Umsf%CL#^xQHl5(e18&=Ree4xE3CQX6Xh%6ahW(%%h@{nV>
zHc(ac{yi}sj_Ne(+m4oVA5Qac1T*Zwx79ta7n;Rmz+XdHEv>U7F#ITOpJr1GV#&}>
zH>)>4@CD)DD{Srq;a!%2Oabr0=Wy$P4gwJp+<CqGjVcGU4>jL4;DN3G+s7K(;ff96
zxemZKial5{;oI0){=cOqCYN{+ODZ_YoBD2O@bd@s{zpO(j_$8=6Xh)x0<i<FYRF~!
z14k*ln;S(L@KR1L35mm_GWS}p{%0vc?DfAfsN9l2*C<J-b4Iv&T<p{l`PWIqMs#p3
zm))BTI_t7@r6(||7S3cQZR!*nh0RS*9xP-}Z`dkf=CIBh3u}unmqkr7E7P0=2d8AF
zr=r4MhdWWX7*seAaXyc8qdd)*3!c1E!qDpp(#lblq5I<%W$)j<I$}p@(wNAU94L+5
z!H>{q=e{qhaP5OmLSAlq!!-@5RM!0FY*?L-H+F9YuXJ+02~m;3snmZdcOZhaWvW8^
z)My#M2*k#vQkF(Cg(>nvZqGt1cj_mJb5~WNbF<NIRpiM!{GYNcZe|WG9-KS^XgmRg
ziYV@D3zX1}8xftQVdngW5dQ@DH8<iXR`XeI_TS>T{k3wY3SDhrV8Hg<xf?V_W8Rc?
z9S9`spPv?Y@Pnjjsb;)Pb4P|p+_)1X@2jZfmRjLSZyx#jU8T~?n#sd){f{(k+4CVL
zT&+MRipOmUbPfkKHBx)WoRLDcf|KLb@;kKAIo4DpVodJ<Hn0H;W*{UkE{-B04utLs
zPg+q$#R?eXYuW6<otBk;C;LTX_HzBOj7&y9zkbEpk`ZUIc`+;>3MH9`iz}cybZG*P
zclfQ(GHvEq|0c#ujkc(nd0u_Si^qT3Z_Z!g<>dvKI2ajB4q}B$4qhWA3Bhpd(od(>
zE~8Kj5`v)54>4j`1E^P@J5vT10t0c#$-L=B-Fj!8hi7ZxXrcsZ?<*)M*xGVh)8@T<
z=SoLt&s>6^I@q1y`5*6`X&_UUKn@N*E)jYS<d&_IGlYd)?np@q+D%bDT3D2=x(a<)
zP>`wqO3_q>MTa?KYhWfFa@Mfkk)FIVI8Gm(^!6=LJ2Q*1Vd=O{HDnq}8k*chbRB2}
zgvwNqKorAs5PFfFxTd<rR2<m-RZHUK6RQSF3HFa4?`&^Z6d9KK15LO|8%&$$oQMhx
z^v9-R1ANzZw;_Z#`7yu~Hpko;+B@8L?oj0>vMWKp01~HCf6b2h{-Z}XNDvwy>m4RB
z<cH>Y6Ac{r#OL>h%YJ|$TQE8jiHqqCy?UKLo&Y7{$`)bkV$u6!-91tHnH#s_)2G#J
zN+<^fgcoQ*O2(=bVc%|4lT)55G7-h;mxKh|?BEAZiS$giVD#_e;=H=XYtY^>1DMh;
zZv<qD$F{{{#}#ktmH>aor4A9I@lEzdi_S2kBHb~&61jXZ5V(7*6Rds#@eCmT)+B+9
z_+PX<8&Y5UMgF^Y<6~nMOHa_$Cs10+n?@eQ>yY5$pW)cs=19_Y@c*oLa(et2Fv3#*
z+t;rj-g>)~*Qt*dvg}0Q5yj|!@3yQ|;cdjLdMU365)3oR6-Ci+4PUPzx>a2MzZXCg
zAm2L|X{0m<TX1jHN4I4y4B|u2HH@pP>yjt`!`AKX?JO4qhn}i6XfdOS@iEX>K*#0{
zf*PFgdG$o)kk1}L9#zC@*LF9fSmJxn&rX=D!a3ilzRSsB0b2ci*_b_OwVNhM$hj>~
z1T%=;a&mG&*pAi1-Fq||Yp+CD_5xrV4y54*UbO%YN`5~6YKwAyl|K6I+qXGfT0^SE
zV*mhT#tk$n+qmMak5V3&F>jq4iw#};<$IoOB1y%yL?h)Q&vH#QC%VfLi~u`}LwDb*
zW@{j}b+xqGcf`8UmOd}jL`363^)$~2L-zxlt!8h}jf0=9VF%FuXWbJS6!g!JY7Gx<
zi78Jf6oEFfc6j`F6%?F>oukc&G5gZ8GI!B*u^|PPYX(VoXzyECWV0#74djjy+KpS+
z{~QwAQT2Um@dnt0t|%G`40$OrKCwRull$Ss#=(wQD=e*`2xx#gT+}o)whtd70<(0B
zrTG=r)OdM$K~q+!Hbn7!*%A9yd8rT%H}RuEopPP|gbj6JVwH$lKG%g`U9WAE(3@=L
z8JhYE9?lhNbO5?tyR@jtrD;kuotHKmvanJD=;8WF`SSc%3~Ba(V&hax^8|i?5C>b6
z67Jf_=w~4Q6{OsQ5*+-qa78xDT0@X_4yQb(UFdpTjG2&d03Pb<QhRp@kg!Iw4DDE3
zTUYAC1_b^c)GAA6Q?iru*&EZNfF3${eh;vFP)nBJU4Y9k;`;=#_kn{W$ABtue%S+1
zU{pCC{124AkYeKFBcqC9lUP|T<Wcdeg=GhR=)pTxX2^U3&8DrOhlVkDb5TdR&=u&{
z5c{)n(dd@ywjQq(zrk0#1hJ6YAaDd7rGU@?t}X=`m^H3xM6HYc!SmQx;&t>TD}MNt
zi_+4-{r5*NxMfPYe7)pAMj{Z=BV>`p4ZySv6OpdCLQlk{LWw6`JO%-iI;g9mfsBv^
zsjIL;;Q<jFZ&&XMIfl1+_bVuuDT6leKRGq6gHs^L0Y_(^I8nFF1*;7S1Y||XgxJs}
z8E)o(1YP_eVKqv*s4gv7Inppq5!}(b?Cclw!of7io-sQ?zq;=Yt7T2#+ZeQw5p$Sr
z4=L6yo%3QC4;)$q>W3hRnLL84kpNVbr};}Z;4nDzm;BLGsLc)S(I;FoBnFeMAxvk3
zvYG3QK=-@Sg*k==GW}UtfJi#{{WO#19@rp&!~=83>2KiU7`*;m<9dP#2Vmy+IMLM@
zzd0V2#1dRMW{)VI-q0)32Gyhk4yq=stdg2q8JxIRHV9^jOloT2&aKvtgj<Q7;DKW1
zfwqEnEA#m|=rm--fs0-RqeV5Ry3VRn+m@AYCRXJXyby)*xsy<qAgl_7x5Xq~=464W
zSHcH_2((3a?;gDI`S;+VpTzX{N-NOMZ3b%N*=~?W{PLLg3nOD(5H72(er16=eNSGl
zGkpD<(XG_Mn$JQnzk%j7`S6xVx*GZ$<c#^A*sye^IlN5}aen>!Wp%3(n5u`ZW#B0h
zu<ADdQYxQ&*?l-R%n}^yVGs?3Xa4QPq4$`Wk;WK=J{CdH?9pPTS&OeoX^y~K)xEtv
zjqva%N(rx1QVg}VgXQs?4}Jk}hKf%~Iff>XD(FdD3B;2g@OSjplP@iz1$jm;I7`hB
zalK#L6xBIRpD#*YyhYCKd0!(g1dBy~e~?-p+Z&(}Nsh$?c%pcpj@Y?DH({IM#bNI@
zoU<Q!vkdT=-M^4!cjc$*_~KX=`8TlA)fU~GHX7z*06sd?*$Sn0%vOAUNPE{2j-jHG
z68JL$nc(NOhSzCnm%hFI4eR(#KMA=0aA)zunII_j)KU18!Op_IZTK{C!YZKV;n`7K
zL*TtWr<b&b?H2S;v^JoWQ%ayl>sL5T-ohY;b~c}bDtvY5_r?J$U9oO4h#MdavJmyS
zy*j3xgnUq`FC6o<(HI;_m!_efd5~1ihb~PY3#m>E!e2HHPR{({|4<?q6liheN4bfn
zC-9uyVCCfGL?W`@%>c1*$?W_W`r-qm;#ZvNb^2&%FV4kRYL!(~z_|jP#RBVhhq~WQ
z;u$<Dh%HYs-C~`5t^03pS%W>|g%sAQOmhF;W(QfhNt15w$P9%bzC!!esK8q~y9FdA
zm0-u3-wMWLua>tmTr<FXJUTj>nvybLb6c>O2?1o`?b}a5+vF#L11(nf`%qGrdQhx=
zwqjz{Z~HSRtRwKg%$?@^h(Lb7W4G4njV;eC<JfVL3bZvVS6gr<nkmJm+Mra|%%zKJ
z={{Fv&d_4DJ{qV6=T={d%t;5ZJK5KMC@bRyYs)j^JSW%vtzR6i(@ui4;tXVK)~`PA
z_Oiw<?RgJ7&1QlQ2u&bHQJ9WEAs!jHWvR?^P(V^^c$K&B^k~P-XZ=p+N3Jt=a96>~
zNnZ<8qoSe$-IJZ@bz+O`k|#?Pxw9eSpPOh;^!0<o`Pgc7R1MGZNXD~q0~FFykhaZ^
zZHp-P%mbg2<aTg}MYHL}(DU=Bko%~k*vTWn4WW-7A0E~)GJ;M@8gE9ptf}c956=^@
zt3W$V9swO>lC=dDUA0r_iqrEGBeT}`T1Dm`Emv5=>uYOkfetnE-I5cet<^^Zy9Fot
ze+o*sonRGu)xBv;@rECne;-n=vbJ`Qru9&c9~JCFK^pczOY6(M4Y8&v2I7!iZ*iPT
zq0}dkv}*2S8#C=LiM{J(;Ij-ER}4mGECMU=OFYzq!T)eJf`XGax*J3lO!$=JbD-R5
z(E0)OuSv4w$e;HKyZ%vxBE*l96(_0E1e&A;&Q{YD7dGLIx|WufvNF=qr1&3Ha$CZt
z8ksBr`zczJxHe47Jw7L}Q*f$v8i93X%pPiL>m`r*Jz;;JW$Qan;8V%{TU@C30of=7
z-i$l=uO=W^V`N#l1ek)sR{~a&U%!lBe+g_~acu+u%6UHpz_boGRUH`ChQ0l$9O;Mn
zg*o_jwM%t@d27BnKe4Z+^}<V3-UAt~w@M6@9yitDWw+Naq?-7S&iu6xxQVJC;DQ7R
zCkjEabxCBCF^G9C=O_Q0tR{@E&T71LjDT_uIWN>gI0js2AmBZAaBy&RbZ<0P96Fcc
z=QR9+e~x1AyfpHaL4hI;3}B)g+CleA953bSnR;1+NCCc&3V}iT2P$&Fk__AmSYF;a
z;!sNqKi`6LC>^vsT5wlLD6p2LA26P)ii!&8wB^sw9;Xgc6Nhm1uY}D6>!btNXqvio
zKGuSzsKmHY3yGJm7N()cgghK8_rE-yu_%G|#htdZulBWyPQ!u3!%UQEw1^PQl2(K5
zPzJce)_*m=LSk&)baiy@2npr9iW;;3>(v6e(xw{dWB5uG7(g4$c>eTaaAm-SE+xQ~
zE;%!^6;#!9H9`~E#%H2a&wvhGO!vr17+7{|kCgK!sa;TxoPFH}#>V>`uec%!N$DDZ
z$`~&*iLyk6THr~eB>hi8Lm8>NclYkZ;?C?22vx6NzXmfB+`jfY*+tid{KH2#kInh*
zD)l+kGfq1x)Pp-_U%q^)$i{*Q9J5acj*v>vSQ=6Ja~(o*<Df(Fld5h0{=#c%;ADj9
zegk#0yF4l&5F=02{qn!3KOPli*HRl7L+mOg*uaB%@7j^mu&JgV&9-{Bv%pEYLpzuu
z?t@^aj>-q?2-5X4d$KPuhK}{uYZU8$rY9s+*^T4?Mfz*j8Hsr*&#H6Y{K$+rln<~p
zU{80*>}x-2qdJ!Z<#Q_=8V*77gN#Z~PtWlR9JTafp8VqC%~e&~HKS@W%h)|GGXa?z
zg3G~j;|@YmId77aX(D8S&`?qW3oH=#aLZ9Ne4)3&q15!@L&B?9aK^h}jk3bTpL{IT
z$1fn)Ezx%Y=mxw+FZ;?P@Sx$-7=Lo1lbEoteIfP9K}b(qdm!bG3K9=lo8>2yJ^XpB
zs>W5Tcnnhs%vQ50U;j23*dVvn!s+?rF!IO?)<n<Pr3?5^;;{Hm*4pp#NIYMz{wggQ
zA;A}O)W_6+r-G5K)6b!~y42Q!k<v)Ji9jgo#!!I8hB`<eq6pN~{+}^UDeWNoQ3M-<
z-SKSC({|~y7OZ?w8-M=z!OhJbcW=gv!ObM7EntR5^u=s=yk)n}rz@b|VwgqoIdK!%
zn7Nb?ZD%=Ml@gglc7nG^=J&ioN8EwadU)nvJhtNA^goad)nloc9f8wdC6qe2aX^Uk
z;t>$PnG(%rq~+6dM{vlmibK%>JX5Hd3r^FX`RwQ|r;l6RkINbfZuhV$5nncXV0{Yw
zm|>@A(DoS%Q376At6Ta>__@ltBfy!n5Z8bw7i<~NFHWW-w%?D~fk0$4@CLioK`8aV
zQ0an+r$gfPm6esPF%{FY)E}l6cU<T=5$!Sb_Z9};%FKlZqx(Vq1>!mr_HJP?b)-Uw
zlK68~T0#N_0UJ#a^n&^!Hww+BCYg7W-;`+vEVo1IZ}?}2vt^iUfmC-c{~~_y3o=0m
zK3P~toM%v*#)Aj9!NCL|@7-RkLhFA7uj@m;Jk>}8@qPl-K|TbIeecUls&?SZmzMdM
zdjOEN$jOAQMzGB^-;N3{Wi_f|U@6)v<`vo6`3Jye)8u>PD)=~82N%Fi+HKny({jDy
zF<{03^8xn<U%&MAiGr0AP=QP~5~C#e?AU79iA4p0J$dbd9J9YMoe4s{+wxa<M5fZU
zJ#QZBC_u|ymJ`MxeoYuZ(AS5|?JUt|j(isqD2?a(_Rq;2*kvIZoK$C?k;v0Wp2kUn
zk200tB5=~7ZqfnvebzZIKfiJ6AF!{WR6?iJX=3qlAXcp1|2E0+U#t?|PCW3H0xkoz
z*b23HBv(Pk6e_#Cuoy^CPZz)V0RdqybPWTwE$1UK!L@Hfuh@vB1BSrW3|^xyec{al
zm)4i^^DqCq%?lb&+_{Fexlk(Z3n}Pbo<4mlCx_2s5U1yC>3@1{zaS}OKDH~JcdM|~
z8nw`U-N|<;JIqa#zQ3x?TqAcRJf~2r$bYZc><pUR&x3>cF1YwXQ5sx$w*~1)TY(U`
zbiIKh9WBrL&LtSb94&8E{}Zr~d@KVT5|R!k(atIdE35g=2#P&#@mi`PlHDt-t&(ze
zd>Ridpf>I-4E}8Px%-u2CYvZQE<ODWAnnon;<6kAf=yow{uv(3C2x0X_5*Ep!&g{h
zsf&|n)z$0=_DzZN8lb9xRH9EO)X)qMNS4n9N;E~-We!S@Mj3RJ_|ne8bkMuswiy6F
zuw>EeX7DmqSPhS;<!i0~Za#^J76stgRe~Vh;%AM<ZvFq=wlRiKvrTgeo!;oN({c`O
zyS9oA_R_%bO5%qPaI4TVF56=2%|@HAH1g@Ax>zptO{8O3hrsjm(;mj>#z+X=jXiGx
z(j+8&KJ>i8?rZw5KL0s5f#A{~5gSTQN&?>oaN1c@-Tc%B-n-hYU`9W<gsUs>i;a0{
zhIW8AI62th3<ik@LgeBo^P&+fzhJ17xqn5LP`VcH#;f;N<@(Pv!L4W~7gCSf?B*wV
zayz_xvf(A_xi4swPCx6e%G4s5`FBvEMWv-r?Cccp-v@=G;U3UTNIVd4Kof<dZ*h3~
zne>Dt*aGV&gOIQ|V_1jF&nNZbM}J-gBRw6y5#3i(I_h9N-vmRG5IcLw*Y8W#_*qnx
zUT4gTX?rn?naDZ!CLZc5W8gM)UjCYYY1ma@^pm}ZY@cQdeu)yusjL(LSScbRLP?x0
zMsU>M-rf$46GU^a%(Vnk&b=0r;9eZTJ%zct*KA4~trzE3vEp@(Qy)6fLJp^Sd3hkA
zm^>TP5!?=8Nz2P)BhL&h<9F~!$ZF;ds3*i3#>(dwZkRQ?{(Yq`(P-I4tZb4`X^T<x
z@;ds@HqD~`C$z6idP}8mQ&LirlkZxz2Lt!NeJ02!YMz!iDzeO?GU14N2l66q7Qjqc
zcK_DrfLr;RcM~R7uZDFXf|<n^+(aKdc;NJ5`Q6R(kK}(`Fp6B182R|!b$PBV#h30f
z?}xDwPY5PTjXXej1%#4dfdb3^r9O!JJ)5p)a(y2V9Hdo<R11Hx{aoE*NZO!tgN39}
zGVHg}_kfk{S1(>vSi`-RA<p6!^!PoK7muLlS;_GE=QSUFceo38MA~po$n{Sz^zM%P
zYm-1h1jhmP&sa=c&XdH`_O@G!yi^u1!50LfZ&xH$FtU({ynGzTB(JDwxup8b_Q@HT
zdin+j<vN*Yqk(jVZ2+T@@pJu-Z_g<3q;p3|e2l22>}W$t_X?deJeecsx}&ede8hhA
z^}8&GJv$#k%cyi@BZtiS7F=757l%Di8<7~hAF4n_h~VDVDb)om7;=S1;^5a)m?O9o
zabV2qQXP$K-|>C$U=$`0-f0zm3X)DS$=6~=gH1Jfch?Pr;Li7XQySsEqtyN>VvS6e
zi_&|e`QWlm1ORqu&m}B>m9v9?Y5VjtDFEi+Ao?sN+};qlEAxxMSeAd*AgSw$vF^vL
z-!4uh=?Ug5E*N5pRrO((t5Fh#v<OOb2Z6HB;JyIg;qH&e<=}zQ@~8enpX>-$s$BW#
z6tF`@)=OEx!x-rP@6y(mEjn(n!+q`-n%0XG$b>feuv=7+f$0&;GoAT#izLX+-PH8A
zb+U>3q;)dTqF-x-{~=4&I)2Ad_xJ_&CLB^Je0sAxavnjF(QC;Z=w?aaGH14IvbyC3
z^8Cq}c_9*G%$v*=sglfVQe!s)B{SYGgi|UgG#FVtW(c?N;K8fZ)F|v*V5lq@wUAYn
zmzM|0s~x{Vd6=moA+pzhXzMlGqp|lov9Q^MjJ{ZB%J;svd6MI`J-h|r;D5O@n22Jy
zm5%0`6^Bn4WtO4$Jwh3S{;#qF0vEDir3dOyONl+$?b)-^OLY9Bmha<cAQR#ZDuDQb
zXaJU}HVA%Thw=CKXCoK!Jp_%s8?PN)?Qh>s!s*e~O<I}<zN&Zkv*d=ARc{2EIao*s
zZ2jN?rHcVc*~qcc8g4IM5wFq+6AmuqqJVQ!a4tdXdI=-t<U+bEvne!(wJC3<p#FAS
zDnEN-me<fmKFOd!s$oX#pp9Ndm{{Q!j5dPz(YimW843(YS;0tJBlfMQ(raDzwSeTI
zrM1MDxrQyqnKuljhM1Umv(UWZ3NL-xER%d^SX!?ZeVkpFRpSMehfL482w*~CiloE<
zX$A}$_2G9<Q0sCPVlTC86=mgN^;qQG&XGoL(i?4+(}?U6>l^0uZ7c;>pk)Th{1Q~9
zK+KmKEjkMi?~o-cQp$nmEWKs7dJFPsRaMoGA3vm+uxv9s6+BkmKK%LfCp0t^e%$$N
zdU0oY@0h_pgM*dukcC7f{=Qqma44R1C;)$<R3c_bJ3vJ(JWv;}g*l)EBqC@h>JDWo
zIq;P(E?a={Q&LkO;l+PoRg`DCPJ}!ErsuXkxb5Xf_FvC8nDdA8jz-WWYjD;09Q@NM
z)@=sD1N@(X!tEIG1yT@nAjtr%fnIocoZgV`c7<mKA0Sk)rGbb;H_r=x+8wd!pdQt;
z3F$^*8MTMlo}IgqQZX(!W@A9Y-rwJc#dm@dJxndAFGKzZ<;Ms^PhbJhQ+fp{?Tg4F
z9pE5AS_-2{`b8F!oTU5cMYdpPy2YI%p(j6T0H)MFo^bsA@o1(ki2sq4UI;zeZLCP}
zJEW@td<RoYVtRVCD!RlAg#|Ms@7_^UUS43|*Z9YEB!NHh*A?&*gWjWxvH_S8@y@R(
z+<Ws|<zi*$=o5hVS-^wOx4LNVI(!cxs1GNR^5gj7>q@5>bva@~f3L2pid?gs*$xFw
zSIj&qgV^Eu$p#e0(%f7tkh_82M+C$*tbeo0xPHI$&)>fgQb1$ovf;H6mSCKnfl7mQ
zg4w3w4{@D*IOqk2G`xf?(j}vm7mSLqk>Z-eEnYxKFak{g5TqH#6+q@4zDoXTp|^h4
zf+_gZ3hIviH<$*1ObZh=u<GEBv^J1mYi4}xL%t!N!7lr2Nd}Qgo*_I|4yL&A()!<#
z-3~QLiH2|E)M!aNgaEi49UVcMQdUzNUv@KpRE3Tb*oJ-!JS{*k0fBPnYKj|c!B@rh
zWk;$xh%554Pj_;94%kr0={E^$EHaRb73Y;U+1o)Iyn%TAMPbs<9;t)wP*hBTX!zdH
z8uI{VKi(8hy~JbKWi(MWPxJ?hJ_@qsM^Az7QUMa&iv(p`7U<96gsr*zz$7Dx6+=5Y
zT$YAeU6$DC?6+@M!}FDtI5g<}&Ln10@n$D0a;6jWbcXR5aFR_|Sx0ru2DFAaR6r{D
zipgS#SE=Y9QP~}bse+v^_fA$3K9tFrNmfi)C0F=#NXINhObc)r0A$6K^(k_-ZK@~1
z$P&Oqt)ix;2HDWtTa@-NTOa042B;T=AxZv)<M#J&;_KJ?rMiX@cS@8}J4_!^d^R>M
zr+ISJCN8C5BunNiF%87<C9rV)+c#FM7j*jKHEL+5rkegCj=!p*;g1%-ljAK7W>sOK
zfhR#@(oaI+HYB!tS)mp&nEc0&euWGagz+U%NZ?XaS6}o3k4(16O)gh9N5>S^cWG&9
zU%zTK7)KmYDkZ$}RM@kKgl!SGyh0g~_aC}8A}<gI%cySZuKjNI0c#x`Qk+(bYM-pH
zmX+U245~q4`D*rvp<t9q-g+)x#trTlXy+r~(RQHhkul?8LS3FCrGwh|!8Qbz8Q|96
zfuxw1mvv&ugoLRxm=OcN4M`}tt>)(Dpylmz30g^Hy8(k&rDJ@Hw;E9UELYeT@IMtQ
zOgs1S2Bb$uAN-q2jgNov63n+S$Z+WnG&D5a)H57Eg)$2eb^j#$gE4QZ?v>@`wKZRm
zTBbecqro8_Y=NqtTst@!xs?)gQCe6CwDa{l_LQh%+USK(FL1%42DKFspV&}AK>-}|
z@9Xa5d^^ELME5%9x7etMUhFFo^>kc=O_I~h>*mV$n^6}J@2;R>R|;$Zqbx9&K-`_S
zUL0J2Q7bVmZOvKu>*y#rGsL{M|J48X27S4=>X(@fV*^F_Zwd@pkaxkX4OaY{OxRzs
z=%!2yMuF#vVU%Pb(xGgz`~^0{J9nNzH$65sR%j!A_#bmP0}WwLL|ZcWf+)>9$$aAR
zy)`14N(6JmiM5o)f#L$@HDBwp@LaYgbx*Dvr<IhHKsE$+<P^s1LUsT3xGHjs!)fyY
z)-1zs-vHIeU!;UlWfc)=g#R=<8@rEOTdE=&WOfvZ9aDhaO`h9%1?sQxdq#3QKE!{!
z!BW+Ow>OaG7e55l7Ep0Y;KT%K6&S0li=lmk0J+0pVr1gstq}>y9>P1AB_nQPK@P0J
z9{zzZ>Gv+l5~yf0`pYZoK``tG%3IOLk8}?L<NwIuD!~Y)zP>)NX|X(bVK>yQ<K;Xk
zWNX1`VX3tAtI~P49f0gDc6NMK0;H5v<KHCkM#9J~c=H5()l?1l2~OP#?^5RIqp8Ih
zw6&}a+<`-lU4*Xi*GI3XK;oW>V*W!YTHDxMF0r7bA@`DNBRB|@mBCB{Y&6t)aT}Ge
zOj<RAcsU-nWgREn?ZXZKgL_MQ+B>&Mo<e_dHgs`H_K+0E<J3?w<(UkU<~6;Y!Qr-0
z>iv8zzw@I-5KYY>|1jgBB|5R~ZbyNz&tD)#hGoHxL^K$eLGVMOhG|L=p62S+?Ejl_
zZo6?4Y<MSmR>M-=CnwVv{{1}lpPa!7gP6DgSK3GDtoU!-q9g4%k;wjWi_)|j4I@?>
zbuAEKfT1>n$RwD8**G~L*Zz<RBaLtH;8N0pp;^FD#8<A2<hR)gf^|s9haf0BCnu+&
zp&=^^OYVDCL3~Rwr@yFhqTKkbv(y-{rA<@+wmcbpH``zm=lW;wrl}Z?X885e4<1lh
zzMb)Vki2?$ra|$zL<#4`LiF9=p3r6^AIfF3^GLIT=q+adtq}T8NM<n8ow1nh$gTva
zT{PVhghIPM%#E?Wyc*fGDi)PzY`V@MO$^JBO+k?KI*cT}1}Xg5YcV}63dXRR8^qsl
z#}d(Q<Y|T^B_)BVKkd>(4-{p9oC-qv&kKt;FgacS6ByUW_V!=|hsbzeL&VIFVJZRU
zS>9Z~V02HnP;&T&SglK6Bziz1uNLRUr@aZY3vgNv=V%xtmFlj-vT2x^sh7&sAo15P
z4tK_u)urelr8EIi0-@<NS%p6rMal}wx12<9-0|@-FdYK}ss>3TCHTxbnv~E}!KXuu
z5mwo?^exKf-RPG+c*%g&<$D1f4ylm!njfFtDxci^bh)#?Z5B6YJ6bQ!Hm3bgo^&P*
zo3OyVE8r3^Fn=cyCF2$np!T8LW)_0J$_E0-%zHT>tbpX@FBKie!Hv)jZ~#VLpx>Y@
z55$T{K&1`}`JW!bEJf-dM<k2R&Mv3jUk***a^X;cTte_Y<@zWE(vS_&Zy!VFyAPT)
zjNhT=kR$|v3KoYlr@wuZoy)V)q<r+$p1Zt)sVK|*A->KtILBUp;uWBInQ;@faQK9H
z#}NiHnz*-{pP!$+Ji#Sh&dNfKz?0P+=<U7Co40L95;apS^OxegH2zSb_6@07Kq-e|
zQt-z(FeYS=E<@*92Z9;&eh`^&RXH+;^o)#7`fip}Qd7ff-xU|9kMLQE&27e~@5Uh(
zvTJa&`P`Ry^OE=kxJ^wM*IOsO1c9Xqu9TZ-G~Vs8`7PmeH9G@?B(SoqtgiO=^~LdN
zuwZds7OY@oSjUSm@1UwW2+4@}fdP*Oa?OO<^K@axXCR+ItAMew;TW@Z6Os3#V3tkD
za~4)zj*9rO4s&LP73OU)6N?<p|D#Qw8N?7R&)4{e90>GE{b5(^q<}W_O;0fx3`JUZ
zv7HG(L5k{*2PNS44S~Qp$gFAiJpRGaW-@{f)3m%Eh6x7mPOGY@tS&8q2B}%3U1Ng(
zC-EONx(Ga}eD+|NB?rjMV_0Jc%CI6G8&19r_*N)5R8e;w>FmoNZC?4yD>gLrMxev7
zUS^}c2i}BGfTd(TBd{h%ohABpbr0P5ml_s~Z3ZKgtbx_*|0@axn#*o6S{}HzTlk3c
z2OE*yvHW~kx(@s(;}+ke9J#2tYf}D+7H<G`0N1Wv4<`)z5lDxDg;GV_&O6mrRciOv
zYaq5xiS5}nBE?Y?%i5ocn5yE04$rR(IoR3TgOMB65XsdBZRCFJ^HbapU`_w?N`n_Z
zw)s+-S3zHwb#&O8>rxlr`v!cq@+vVAbGVGfuigfidBEM5mQB7>Sow7z4kKZxrsfKP
zPu${>tWthy8^PlHt41U~@p2W*P>o?lF8d1|Jrjs4W>e=si(k@DV0L|UjB#3d?W!UI
zrWed<K!SsQ3kGyAC!`^Fu?7!Qx7Dce!)D#RTMt%Z``W-lV%@8U4Z6j(uxw>zUo0zU
z+7unMC=qx_i~DrA0;uFCD68*L=!gOx(9AZQrq4+G;O!LIk*lHC9X(-K+}Z$a#-UO2
zEkmC$*HCyK(=C3(B~P9_LHDohc^i6!u;_yY!qij(=;xO&Neq%KV&Po_Vr(F}1JHqf
zG^;lbkCz2)C3+IEJDS#($q^de%R(vVBQB+C!b?*!M#$hfQ}@#`*Lr%m`~WCWc!NQ7
zl@59NVeZr$m_k^W@tgVd0-ntWI$p4Vvk=LZ#`$By2W^T0!jzT{4h&FUjv#~O$&CQi
zGBD$T)(1Xr?Wmi=UML~pgFzv-Q^l)JOu$_nOudwYFmynv8J0qUykw_=3bqnTedM2g
zH)mw&(q#?V5^Ye0cZ;|*f*VVphU=mSv*Fr^d<agPe`{+{oB-d$2f)X~`CF50V3~gp
zcbIci>Q(UYsPD3D+#5FnLd^dSw&42<ki5^=Y$ai06x|Pl&AZuBxSybd<VWF2>%+sS
z@HN)}`xVxKy-m#XSEjo*D=Vw0=!Up>dY#RSkboN)fIh(cf~+ez?LJUfOMFb<A^*^V
z25hv!LfJz=5YIu*4iYl2o<s_ozzY?gJ*#Cx@S7GT<y(|o4v+u^V%X~M7t3^W-57-W
zd(T$BK{8G52fGpIU-G%qE-$()p?0Zyd5Qc8(0YpRgZjsV6N(Reln}gZKhp{Wz;9P4
z%420&0Hy}XJrVi|gfTQ%OeGAlgzL`*rhlyNl^Ikoz{Wj!^hmlxWW|%YE$a9^Ot}G=
zbu)$uky&RH^Lt<*+-zV7wWpq6BN^#hWn00e*jaJSz`oI2j3LzGi}3tQD224qF|)3K
zjvc;NVDGaZ`ImnNH#VqSm%9SE`b9`2j`ok60Z5!<GoU#@F<#Fev!6B3FDRgaHKL@<
zD=5enr)KV4-J>NT=xdkfS0Tb7!Geb&$H1uY!`I2l^))r0Y!wcaqPnV_rX?uVvQzM@
zCrx-K080r06AUl8$epBqG8MvqX<&n;*VNRsu&~h61L{Y&IB~u~iU}Dl5AQ#ak&yw?
z$JEp`_N&1f8zu3`j3W?5o?^<wGY_r4hojLWFsEq><qYZ<Q?Q233eXnGd}bK{+;2(k
zegi8<tk`yMd&m`mTLGO<v9)jJ%9{hV0mq)ph##QmFarqzwEvLjfeNsrx11B>_;x3&
z1M9z!)N7LWN#x??OqidTM~fi16Yb$dR@)ApL#!bgrGD3DXIr!d;zJ799D*hV>OdtV
z2%z_1p?d}CS6`mxvTC@v2&@#_y&Rw40;L*yAkZ?lw_PdYZ$3WL=zx~J<|f|loA6Z6
z+#&CP29C!E^A_N`)JN-TYwv=#(O<Q;<tZEk{Qm(kzx#mv8;p4oH$?|V>Z*W}Zx1Gd
zg9zuuc|ML4h#FDPO>-bWp`4nUX2|DePl*z2X>kd209i+l;qqdqBMl1vU_bUAq?!OX
z9IZ^QNbuKvfkAqB^+lKEBs6vF_0ug6Ka<ls<@i}LHGw4LU}slYRz~nSaT^zm06i|S
z5HJ7<mKIidcx46Wet;%_9{(TWNAMda9g?iyc0T|NvJTezgTggdmyAA0;&pZ-ETI;c
z170x5V|#YI$0jk-x4H-K{8_TXC<1-=13!y~)B8(X$eb`QCuaey5**MT4G*^`(m@+-
zAL)p_Er3X~Z<M<7+S+Tf${M@{66f%88%XpZKV1~Sh}@-8F&DuJ=c5@~<B#y}k9lD?
z3E5x7SMLC`z^VEMgp=skR2}^PSHZRaG<87X!fbhr=`EtL@$f=6s0Cun2C3kKR%Xg5
z4k~KfEn1qPrJ@mrOQG9D+EgCOFsQAfQjk#VfJmr|OL?>^!w1CzAqayiKM<AhP?oX4
zI^B2wgnQ3D_nh;+l%J4QO%6GW&Ax@dn$y`gsQD$(akkd0m*)R&9e|6zFe>E4YPC|M
z9lE)gw>3w%Jzad>OZ{acz+2-JgKWN*Nh4c1-(yK=$*gDmmY8|}-d6x2U{io-36?<}
zVO_!5K<uALA|6ZLcI!!fQ~ZYtKo9OxFc3HXsC^J_fwEVWn%W&ZE6aZ#{Of2{Wh<&@
z4c3qZsEg>jd_<t2%FrjVgw50JRoiy8w>&!FpWG001WJlbrOt7Wq1Q75<R(Vv`grc)
z-Qk<;hq106DAj`eapvv0oIwBS6>~JI@Xs%B<qa6Q%9B&teIM;S``}1CQy`bK3Qk8>
z^Vdr&)=qe$64_4@j2enP!#N9@iW73-Q@`eY$>Y~wmhg_~h=6HUY%G>CQBhGsvUAs7
z!IKuV*<di>inY6WYnj=O6An{l+zcT;>?euC`{Q1#^Ci=0p=E?%!?D7`Ld+>ZJz{Yn
zqm%Td`Ls7Tueq-^NrxH^W?wba7$Y3hh?gm-<T^!{V)xB8LX<mn+Enjydk-m*-n88H
z*I+1Dk*3kupe^Br8P83_)V1S~R5}hTBWQ9EXyMwnin+~NJQL@D^1U6kg!{Q*=J7=x
zA={J@sFHDJ6j;?Tk`82MI<b%?9iObottigPNKbzR=MSV$kW6}&Ev2$;{fkAda*5nk
z{;fL4eg-;aFwDF5E`xZ%Zj;rPf7h<)5W$!E^{LenV1Crc2nKg?%4T?3BD!tJ+nSPM
zYix|%vSsm=)G~VWGm&TwIhFV#=9Z~}Yt-|h@dP&wV<8~go_`lo)G|aB4T9;3u6s@0
z>=0Gr2;eA=V}rvO6AUC0z6f-oipt-g7Ao8}afO#7+}yh(k7KmxvTy8W3KsB&C@Li^
zIGF)?6Hkm@c?YjwPF7Z#!~v`8SgUlz?T&y1QY==fR9Kh5Wn-9q4rx|tx64ud=8^vI
z?~>@-ImW1J`z2Ntc-v)KQyV&-LiJ$**JR0=?W^bv0E@TbQS*2_z$QJOA1CZl9X0g%
zNnw}j>T=ftcUb6n(?{A4bw~>E00>Q3fgZ#!64=MsLCrkUQbe5=q8~1;9;8~(>2&lC
z@I1&T`qkd_o#6p3@fns$#J-@Lxb;qOj*NMRk8EQksNp=+(|qlRE2FADW$@B}jd%Qi
z7KgC?zHxb<XQsORf7il0MhWRZ(5t;zNBNh>$cWBzzT>@5<#a>L>@!^rV%KQtU+zh3
I7s$*12lZE7KmY&$


From 614923ac5d604642c08bfeed61c6cc229ac2dc9c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 21:55:08 +0200
Subject: [PATCH 15/90] [IMP] adding missing file

bzr revid: fp@tinyerp.com-20120409195508-vn4g22yw93ygzj9g
---
 addons/mail/mail_group_data.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 addons/mail/mail_group_data.xml

diff --git a/addons/mail/mail_group_data.xml b/addons/mail/mail_group_data.xml
new file mode 100644
index 00000000000..bbaa7748f16
--- /dev/null
+++ b/addons/mail/mail_group_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="mail.group" id="group_all_company">
+            <field name="name">All Company</field>
+        </record>
+        <record model="mail.group" id="group_sales">
+            <field name="name">Sales</field>
+        </record>
+
+    </data>
+</openerp>

From 542a2bb0da65092f45ba8267ff6a417c772fbd1a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 22:00:15 +0200
Subject: [PATCH 16/90] [FIX] Sequence in menu

bzr revid: fp@tinyerp.com-20120409200015-bzjbaxotb32smsp3
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4eae3c5717b..571db347e7e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -2,7 +2,7 @@
     <data>
         <menuitem icon="terp-partner"
             id="base.menu_base_partner" name="Sales"
-            sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
+            sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 

From 214ec28024f2ca558f87dc61e44a7a840ee5b9d2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 9 Apr 2012 23:30:37 +0200
Subject: [PATCH 17/90] [IMP] Use manual layout for sale order form view

bzr revid: fme@openerp.com-20120409213037-0fehbp1572e0qrkk
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 571db347e7e..4eb2cdd9960 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -96,7 +96,7 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <html>
+                <html layout="manual">
                 <div class="oe_form_topbar">
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
@@ -115,7 +115,7 @@
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
                 </div>
-                <form string="Sales Order">
+                <form string="Sales Order" class="oe_form_autolayout">
                     <group col="2" class="oe_form_header">
                         <group col="2">
                             <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>

From 459f9824b274f4a43884b98a5bae0ba6c0d4150c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 9 Apr 2012 23:58:49 +0200
Subject: [PATCH 18/90] [IMP] Sale Order form view: move social widget outside
 of the form

bzr revid: fme@openerp.com-20120409215849-wknbjoazecclhy9b
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4eb2cdd9960..631d5416dc6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -279,8 +279,8 @@
                             <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </form>
+                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </html>
             </field>
         </record>

From 4a9d892e43ecff107bd03cab45f6b29c025db8f2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Apr 2012 09:42:18 +0200
Subject: [PATCH 19/90] [FIX] limit on name_search on partners

bzr revid: fp@tinyerp.com-20120410074218-pj4iyn0zjxgo0gbr
---
 openerp/addons/base/res/res_partner.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 6f04c3483cd..699fb778fcb 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -310,12 +310,14 @@ class res_partner(osv.osv):
             cr.execute('''SELECT partner.id FROM res_partner partner
                           LEFT JOIN res_partner company ON partner.parent_id = company.id
                           WHERE partner.name || ' (' || COALESCE(company.name,'') || ')'
-                          ''' + operator + ''' %s ''', (name2,))
+                          ''' + operator + ''' %s limit '''+str(limit), (name2,))
             ids = map(lambda x: x[0], cr.fetchall())
             if args:
                 ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context)
             if ids:
+                print 'ICI', ids
                 return self.name_get(cr, uid, ids, context)
+        print 'LA'
         return super(res_partner,self).name_search(cr, uid, name, args, operator=operator, context=context, limit=limit)
 
     def _email_send(self, cr, uid, ids, email_from, subject, body, on_error=None):

From cecdf06c341e30daf286ada5b01a9c804cf3ac93 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 10:03:23 +0200
Subject: [PATCH 20/90] sale wizard

bzr revid: al@openerp.com-20120410080323-r6toc2banwbwl3na
---
 addons/base_setup/base_setup_views.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 453d4b167c0..52591d9b853 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -132,7 +132,12 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Configure Sales">
+            <html>
+            <div class="oe_form_topbar">
+                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+            </div>
+            <form string="Configure Sales"> 
                 <group name="config_sale" colspan="4"/>
 
                 <!-- this part is necessary to allow the plugins to extend the view -->
@@ -145,15 +150,11 @@
                 <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
 
                 <group name="config_crm" colspan="4"/>
-
-                <newline/>
-                <label colspan="2"/>
-                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
             </form>
+            </html>
         </field>
     </record>
-    
+
     <record id="base.action_sale_config" model="ir.actions.act_window">
         <field name="name">Configure Sales</field>
         <field name="type">ir.actions.act_window</field>

From 3d6ae8f74140c7f4a9618d725879c804bc9a9cca Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 12:50:30 +0200
Subject: [PATCH 21/90] sale_order and sale wizard

bzr revid: al@openerp.com-20120410105030-4et6s3xhcz87xmpm
---
 addons/base_setup/base_setup_views.xml | 36 ++++++++++++++------------
 addons/sale/sale_view.xml              |  4 ++-
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 52591d9b853..681ffcdc25f 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -132,26 +132,28 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <html>
-            <div class="oe_form_topbar">
-                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
-            </div>
-            <form string="Configure Sales"> 
-                <group name="config_sale" colspan="4"/>
+            <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                </div>
+                <shit string="Configure Sales" layout="auto">
+                    <group>
+                        <group name="config_sale" colspan="4"/>
 
-                <!-- this part is necessary to allow the plugins to extend the view -->
-                <field name="module_crm" invisible="1"/>
-                <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
-                    <separator string="Emails"/>
-                </group>
-                <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                <newline/>
-                <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                        <!-- this part is necessary to allow the plugins to extend the view -->
+                        <field name="module_crm" invisible="1"/>
+                        <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <separator string="Emails"/>
+                        </group>
+                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                        <newline/>
+                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
 
-                <group name="config_crm" colspan="4"/>
+                        <group name="config_crm" colspan="4"/>
+                    </shit>
+                </form>
             </form>
-            </html>
         </field>
     </record>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 631d5416dc6..792d960b7f2 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -280,7 +280,9 @@
                         </page>
                     </notebook>
                 </form>
-                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </html>
             </field>
         </record>

From dd2327e4cf72f5862410ebc21b9071c9c39f6995 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 13:11:37 +0200
Subject: [PATCH 22/90] sale html to form

bzr revid: al@openerp.com-20120410111137-p39v47ls47u7ocvg
---
 addons/sale/sale_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 792d960b7f2..24a88eb6b41 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -96,7 +96,7 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <html layout="manual">
+                <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
@@ -115,7 +115,7 @@
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
                 </div>
-                <form string="Sales Order" class="oe_form_autolayout">
+                <sheet string="Sales Order" layout="auto">
                     <group col="2" class="oe_form_header">
                         <group col="2">
                             <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
@@ -279,11 +279,11 @@
                             <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                </form>
+                </sheet>
                 <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
-                </html>
+                </form>
             </field>
         </record>
 

From 529293bf6647b605fd2f5ac5306ac68e481b8cb6 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 13:22:44 +0200
Subject: [PATCH 23/90] crm.lead

bzr revid: al@openerp.com-20120410112244-2813dhnk1p1zf92t
---
 addons/crm/crm_lead_view.xml | 39 ++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 52b7c88c2d4..70fabfc05b5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -51,7 +51,19 @@
         <field name="model">crm.lead</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Leads Form">
+            <form string="Leads Form" layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
+                    <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
                 <group colspan="4" col="7">
                     <field name="name" required="1" string="Subject"/>
                     <field name="priority"/>
@@ -121,26 +133,6 @@
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
-                        <button name="case_open" string="Open"
-                            states="draft,pending" type="object"
-                            icon="gtk-go-forward" />
-                        <button name="case_mark_lost" string="Close"
-                            states="open,pending" type="object"
-                            icon="gtk-close" />
-                        <button name="case_pending" string="Pending"
-                            states="open" type="object"
-                            icon="gtk-media-pause" />
-                        <button name="case_escalate" string="Escalate"
-                            states="open,pending" type="object"
-                            groups="base.group_extended"
-                            icon="gtk-go-up" />
-                        <button name="case_reset"
-                            string="Reset to Draft" states="done,cancel"
-                            type="object" icon="gtk-convert" />
                     </group>
                  </page>
                  <page string="Extra Info" groups="base.group_extended">
@@ -165,7 +157,10 @@
                     </group>
                  </page>
                 </notebook>
-                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
             </form>
         </field>
     </record>

From 8c1b7d67ce0cb7936cebda80b9a79473656f0a59 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 13:25:34 +0200
Subject: [PATCH 24/90] [FIX] base_setup: resolved tag mismatch

bzr revid: qdp-launchpad@openerp.com-20120410112534-rba9o2x8qm1jmuwz
---
 addons/base_setup/base_setup_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 681ffcdc25f..03ce542ae3e 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -151,8 +151,8 @@
                         <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
 
                         <group name="config_crm" colspan="4"/>
-                    </shit>
-                </form>
+                    </group>
+                </shit>
             </form>
         </field>
     </record>

From 0b6785921a7d8f058068e9216320e0ab931b9693 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 13:26:07 +0200
Subject: [PATCH 25/90] [IMP] sale: applied changes in sale order form view as
 per last trunk

bzr revid: qdp-launchpad@openerp.com-20120410112607-9wiyiocc8sy3pcbt
---
 addons/sale/sale_view.xml | 49 +++++++--------------------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 24a88eb6b41..8d1fedd8574 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -116,19 +116,18 @@
                     </div>
                 </div>
                 <sheet string="Sales Order" layout="auto">
-                    <group col="2" class="oe_form_header">
-                        <group col="2">
-                            <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
-                            <field name="partner_shipping_id" domain="[('partner_id','=',partner_id)]" groups="base.group_extended" options='{"quick_create": false}'/>
-                        </group>
-                        <group col="2">
+                    <group col="6" colspan="4" class="oe_form_header">
+                        <group col="4" colspan="4">
                             <field name="name"/>
                             <field name="date_order"/>
-                            <field name="payment_term" widget="selection"/>
-                            <field name="pricelist_id" domain="[('type','=','sale')]" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
+                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
+                            <field name="client_order_ref"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <field name="invoiced"/>
+                            <field name="shipped"/>
                         </group>
                     </group>
-
                     <notebook colspan="5">
                         <page string="Sales Order">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
@@ -221,29 +220,6 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other Information">
-                            <group col="4">
-                                <!--
-                                <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
-                                -->
-                                <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
-                                <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                                <newline/>
-                                <newline/>
-                                <group col="13" colspan="10">
-                                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
-                                </group>
-                            </group>
-                            <group col="6" colspan="4">
-                                <group col="4" colspan="4">
-                                    <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
-                                    <field name="client_order_ref"/>
-                                </group>
-                                <group col="2" colspan="2">
-                                    <field name="invoiced"/>
-                                    <field name="shipped"/>
-                                </group>
-                            </group>
                             <group colspan="2" col="2" groups="base.group_extended" name="logistics">
                                 <separator string="Logistic" colspan="2"/>
                                 <field name="incoterm" widget="selection"/>
@@ -258,19 +234,12 @@
                             </group>
                             <group name="sale_pay" colspan="2" col="2" groups="base.group_extended" >
                                 <separator string="Conditions" colspan="2"/>
+                                <field name="payment_term" widget="selection"/>
                                 <field name="fiscal_position" widget="selection"/>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
-
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="date_confirm"/>
-                            </group>
-
                             <separator colspan="4" string="Notes" groups="base.group_sale_notes_subtotal"/>
                             <field colspan="4" name="note" nolabel="1" groups="base.group_sale_notes_subtotal"/>
-
                         </page>
                         <page string="History" groups="base.group_extended">
                             <separator colspan="4" string="Invoices"/>

From b3d540a4cc5692819df576a3963aef6cf749c429 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 10 Apr 2012 13:32:32 +0200
Subject: [PATCH 26/90] [FIX] remove Antony's shit

bzr revid: chs@openerp.com-20120410113232-0lcjmr37takli8u1
---
 addons/base_setup/base_setup_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 03ce542ae3e..07258111db1 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -137,7 +137,7 @@
                     <button string="Cancel" icon="gtk-cancel" special="cancel"/>
                     <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
                 </div>
-                <shit string="Configure Sales" layout="auto">
+                <sheet string="Configure Sales" layout="auto">
                     <group>
                         <group name="config_sale" colspan="4"/>
 
@@ -152,7 +152,7 @@
 
                         <group name="config_crm" colspan="4"/>
                     </group>
-                </shit>
+                </sheet>
             </form>
         </field>
     </record>

From e71eaebd7492b547156b941356c2c654d13001fe Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 10 Apr 2012 13:45:13 +0200
Subject: [PATCH 27/90] [FIX] project: correct dependencies

bzr revid: chs@openerp.com-20120410114513-zfz0jdu7d3sg5fqb
---
 addons/project/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 35b920828b2..9a1c0803b2e 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -29,7 +29,7 @@
     "sequence": 8,
     'complexity': "easy",
     "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
-    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource"],
+    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource", 'wiki'],
     "description": """
 Project management module tracks multi-level projects, tasks, work done on tasks, eso.
 ======================================================================================

From ad9ab9765e049b51151bd9317a5c261e2aefc728 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 10 Apr 2012 14:09:38 +0200
Subject: [PATCH 28/90] [FIX] project: remove dependence to wiki module

bzr revid: chs@openerp.com-20120410120938-hw1vykzs9iq02k20
---
 addons/project/__openerp__.py   | 2 +-
 addons/project/project_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 9a1c0803b2e..35b920828b2 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -29,7 +29,7 @@
     "sequence": 8,
     'complexity': "easy",
     "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
-    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource", 'wiki'],
+    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource"],
     "description": """
 Project management module tracks multi-level projects, tasks, work done on tasks, eso.
 ======================================================================================
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7010031001c..c321c3919a7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -247,7 +247,7 @@
                                 <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
 
-                            <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
+                            <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />

From 19531ef7078554bc546f7629141e8da4a7a5b3d3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 10 Apr 2012 15:02:00 +0200
Subject: [PATCH 29/90] [IMP] app config wizards: improve form views

bzr revid: rco@openerp.com-20120410130200-hzrugwth8ty37nsr
---
 addons/account/res_config_view.xml     | 162 +++++++++++++------------
 addons/base_setup/base_setup_views.xml |   8 +-
 addons/hr/res_config_view.xml          |  84 ++++++-------
 addons/mrp/res_config_view.xml         |  33 ++---
 addons/project/res_config_view.xml     |  33 ++---
 addons/purchase/res_config_view.xml    |  35 +++---
 addons/stock/res_config_view.xml       |  49 ++++----
 7 files changed, 206 insertions(+), 198 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 742b842684a..86343512295 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -15,92 +15,94 @@
             <field name="model">account.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Accounting">
-                    <field name="has_default_company" invisible="1" />
-                    <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
-                        attrs="{'invisible': [('has_default_company', '=', True)]}"/>
-                    <field name="expects_chart_of_accounts"/>
+                <form string="Configure Accounting" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <field name="has_default_company" invisible="1" />
+                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
+                            attrs="{'invisible': [('has_default_company', '=', True)]}"/>
+                        <field name="expects_chart_of_accounts"/>
 
-                    <field name="has_chart_of_accounts" invisible="1"/>
-                    <group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
-                        <label string="Please select a chart template to install a chart of accounts." colspan="4"/>
-                        <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
-                        <button string="Install More Chart Templates" icon="gtk-go-forward"
-                            name="%(open_account_charts_modules)d" type="action"/>
-                        <field name ="code_digits" groups="account.group_account_user"/>
-                        <field name ="seq_journal" groups="base.group_extended"/>
-                        <newline/>
-                        <field name ="complete_tax_set" invisible="1"/>
-                        <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
-                        <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
-                        <field name ="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
-                        <field name ="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
-                    </group>
+                        <field name="has_chart_of_accounts" invisible="1"/>
+                        <group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
+                            <label string="Please select a chart template to install a chart of accounts." colspan="4"/>
+                            <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
+                            <button string="Install More Chart Templates" icon="gtk-go-forward"
+                                name="%(open_account_charts_modules)d" type="action"/>
+                            <field name ="code_digits" groups="account.group_account_user"/>
+                            <field name ="seq_journal" groups="base.group_extended"/>
+                            <newline/>
+                            <field name ="complete_tax_set" invisible="1"/>
+                            <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                            <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                            <field name ="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
+                            <field name ="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
+                        </group>
 
-                    <field name="has_fiscal_year" invisible="1"/>
-                    <group string="No Fiscal Year exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
-                        <field name="date_start" on_change="onchange_start_date(date_start)"/>
-                        <field name="date_stop"/>
-                        <field name="period" colspan="4"/>
-                    </group>
+                        <field name="has_fiscal_year" invisible="1"/>
+                        <group string="No Fiscal Year exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
+                            <field name="date_start" on_change="onchange_start_date(date_start)"/>
+                            <field name="date_stop"/>
+                            <field name="period" colspan="4"/>
+                        </group>
 
-                    <group colspan="4">
-                        <separator string="Accounting Configuration" colspan="4"/>
-                        <field name ="complete_tax_set" invisible="1"/>
-                        <newline/>
-                        <group colspan="2" col="2">
-                            <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
-                            <field name="module_account_accountant"/>
-                            <field name="module_account_asset"/>
+                        <group colspan="4">
+                            <separator string="Accounting Configuration" colspan="4"/>
+                            <field name ="complete_tax_set" invisible="1"/>
+                            <newline/>
+                            <group colspan="2" col="2">
+                                <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
+                                <field name="module_account_accountant"/>
+                                <field name="module_account_asset"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
+                                <field name="currency_id" widget="selection"/>
+                                <field name="module_account_budget"/>
+                            </group>
                         </group>
                         <group colspan="2" col="2">
-                            <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
-                            <field name="currency_id" widget="selection"/>
-                            <field name="module_account_budget"/>
+                            <separator string="Customer Invoices" colspan="2"/>
+                            <field name="sale_journal_id" invisible="1"/>
+                            <field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
+                            <field name="sale_refund_journal_id" invisible="1"/>
+                            <field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
+                            <field name="module_account_invoice_layout"/>
+                            <field name="module_account_voucher"/>
+                            <field name="module_account_followup"/>
+                            <field name="group_proforma_invoices"/>
                         </group>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Customer Invoices" colspan="2"/>
-                        <field name="sale_journal_id" invisible="1"/>
-                        <field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
-                        <field name="sale_refund_journal_id" invisible="1"/>
-                        <field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
-                        <field name="module_account_invoice_layout"/>
-                        <field name="module_account_voucher"/>
-                        <field name="module_account_followup"/>
-                        <field name="group_proforma_invoices"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Supplier Invoices" colspan="2"/>
-                        <field name="purchase_journal_id" invisible="1"/>
-                        <field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
-                        <field name="purchase_refund_journal_id" invisible="1"/>
-                        <field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
-                        <field name="module_account_payment"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Electronic Payments" colspan="2"/>
-                        <field name="paypal_account"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Bank &amp; Cash" colspan="2"/>
-                        <label string="Configure Bank Accounts :"/>
-                        <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
-                        <field name="company_footer"/>
-                        <field name="module_account_check_writing"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Analytic Accounting" colspan="2"/>
-                        <group name="analytic_accounting" colspan="2"/>
-                        <field name="module_account_analytic_plans"/>
-                        <field name="module_account_analytic_default"/>
-                    </group>
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <group colspan="2" col="2">
+                            <separator string="Supplier Invoices" colspan="2"/>
+                            <field name="purchase_journal_id" invisible="1"/>
+                            <field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
+                            <field name="purchase_refund_journal_id" invisible="1"/>
+                            <field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
+                            <field name="module_account_payment"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Electronic Payments" colspan="2"/>
+                            <field name="paypal_account"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Bank &amp; Cash" colspan="2"/>
+                            <label string="Configure Bank Accounts :"/>
+                            <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
+                            <field name="company_footer"/>
+                            <field name="module_account_check_writing"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Analytic Accounting" colspan="2"/>
+                            <group name="analytic_accounting" colspan="2"/>
+                            <field name="module_account_analytic_plans"/>
+                            <field name="module_account_analytic_default"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 07258111db1..40e88c604ef 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -132,12 +132,12 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form string="Configure Sales" layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                    <button string="Apply" type="object" name="execute"/>
+                    <button string="Cancel" special="cancel"/>
                 </div>
-                <sheet string="Configure Sales" layout="auto">
+                <sheet layout="auto">
                     <group>
                         <group name="config_sale" colspan="4"/>
 
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index f195cb1894a..ad8d5572466 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -13,49 +13,51 @@
             <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="HR Application">
-                    <separator string="Human Resources" colspan="4"/>
-                    <label string="Departments :"/>
-                    <label colspan="1"/>
-                    <group colspan="2">
-                        <button name="%(view_department_form_installer)d" string="Create Your Departments"
-                            type="action" icon="terp-personal+"/>
-                    </group>
-                    <newline/>
-                    <label string="Employees :" />
-                    <label colspan="1"/>
-                    <group colspan="2">
-                        <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
-                            type="action" icon="terp-personal"/>
-                    </group>
-                    <newline/>
-                    <field name="module_hr_timesheet_sheet"/>
-                    <newline/>
-                    <field name="module_hr_holidays"/>
-                    <newline/>
-                    <label string="Salary Rules :"/>
-                    <label colspan="1"/>
-                    <group colspan="2">
-                        <button string="Configure Your Salary Rules" icon="gtk-go-forward"
-                            name="%(open_payroll1_modules)d" type="action" />
-                    </group>
+                <form string ="Configure Human Resources" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Human Resources" colspan="4"/>
+                        <label string="Departments :"/>
+                        <label colspan="1"/>
+                        <group colspan="2">
+                            <button name="%(view_department_form_installer)d" string="Create Your Departments"
+                                type="action" icon="terp-personal+"/>
+                        </group>
+                        <newline/>
+                        <label string="Employees :" />
+                        <label colspan="1"/>
+                        <group colspan="2">
+                            <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
+                                type="action" icon="terp-personal"/>
+                        </group>
+                        <newline/>
+                        <field name="module_hr_timesheet_sheet"/>
+                        <newline/>
+                        <field name="module_hr_holidays"/>
+                        <newline/>
+                        <label string="Salary Rules :"/>
+                        <label colspan="1"/>
+                        <group colspan="2">
+                            <button string="Configure Your Salary Rules" icon="gtk-go-forward"
+                                name="%(open_payroll1_modules)d" type="action" />
+                        </group>
 
-                    <separator string="Additional Features" colspan="4"/>
-                    <field name="module_hr_expense"/>
-                    <newline/>
-                    <field name="module_hr_recruitment"/>
-                    <newline/>
-                    <field name="module_hr_evaluation"/>
-                    <newline/>
-                    <field name="module_hr_contract"/>
+                        <separator string="Additional Features" colspan="4"/>
+                        <field name="module_hr_expense"/>
+                        <newline/>
+                        <field name="module_hr_recruitment"/>
+                        <newline/>
+                        <field name="module_hr_evaluation"/>
+                        <newline/>
+                        <field name="module_hr_contract"/>
 
-                    <group name="config_timesheets" colspan="4"/>
-                    <group name="config_payroll" colspan="4"/>
-                    <group name="config_recruitment" colspan="4"/>
-
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <group name="config_timesheets" colspan="4"/>
+                        <group name="config_payroll" colspan="4"/>
+                        <group name="config_recruitment" colspan="4"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 2586f4763e2..66b8e735ed6 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -6,24 +6,25 @@
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Manufacturing">
-                    <separator string="Manufacturing Order" colspan="4"/>
-                    <field name="module_mrp_operations"/>
-                    <field name="module_stock_planning"/>
-                    <field name="module_mrp_subproduct"/>
-                    <field name="module_mrp_repair"/>
+                <form string="Configure Manufacturing" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Manufacturing Order" colspan="4"/>
+                        <field name="module_mrp_operations"/>
+                        <field name="module_stock_planning"/>
+                        <field name="module_mrp_subproduct"/>
+                        <field name="module_mrp_repair"/>
 
-		            <separator string="Logistics" colspan="4"/>
-                    <field name="module_mrp_jit"/>
+                        <separator string="Logistics" colspan="4"/>
+                        <field name="module_mrp_jit"/>
 
-		            <separator string="Bill Of Material" colspan="4"/>
-                    <field name="group_mrp_routings"/>
-                    <field name="group_mrp_properties"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Bill Of Material" colspan="4"/>
+                        <field name="group_mrp_routings"/>
+                        <field name="group_mrp_properties"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index daa5bc10d8e..021bab3962c 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,24 +7,25 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Configure Project">
-                    <separator string="Project" colspan="4"/>
-                    <field name="module_project_mrp"/>
-                    <field name="module_project_timesheet"/>
-                    <field name="module_pad"/>
+                <form string="Configure Project" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Project" colspan="4"/>
+                        <field name="module_project_mrp"/>
+                        <field name="module_project_timesheet"/>
+                        <field name="module_pad"/>
 
-                    <separator string="Planning" colspan="4"/>
-                    <field name="module_project_long_term"/>
+                        <separator string="Planning" colspan="4"/>
+                        <field name="module_project_long_term"/>
 
-                    <separator string="Helpdesk and support" colspan="4"/>
-                    <field name="module_project_issue"/>
-                    <field name="module_project_issue_sheet"/>
-                    <group name="support" colspan="4"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Helpdesk and support" colspan="4"/>
+                        <field name="module_project_issue"/>
+                        <field name="module_project_issue_sheet"/>
+                        <group name="support" colspan="4"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index dcf9f921dbb..26d40ac0be0 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -6,25 +6,26 @@
             <field name="model">purchase.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Purchases">
-                    <separator string="Invoicing" colspan="4"/>
-                    <field name="default_invoice_method" />
+                <form string="Configure Purchases" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Invoicing" colspan="4"/>
+                        <field name="default_invoice_method" />
 
-                    <separator string="Purchase Order" colspan="4"/>
-                    <field name="group_purchase_pricelist"/>
-                    <field name="group_uom"/>
-                    <field name="module_purchase_double_validation"/>
-                    <field name="module_purchase_requisition"/>
-                    <field name="module_warning"/>
-                    <field name="module_purchase_analytic_plans"/>
+                        <separator string="Purchase Order" colspan="4"/>
+                        <field name="group_purchase_pricelist"/>
+                        <field name="group_uom"/>
+                        <field name="module_purchase_double_validation"/>
+                        <field name="module_purchase_requisition"/>
+                        <field name="module_warning"/>
+                        <field name="module_purchase_analytic_plans"/>
 
-                    <separator string="Products" colspan="4"/>
-                    <field name="module_product_manufacturer"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Products" colspan="4"/>
+                        <field name="module_product_manufacturer"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index aa31c4adf9d..0e43f2ad8bf 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -7,33 +7,34 @@
             <field name="model">stock.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="Configure Warehouse">
-                    <separator string="Traceability" colspan="4"/>
-                    <field name="group_stock_production_lot"/>
-                    <field name="module_product_expiry"
-                        attrs="{'invisible': [('group_stock_production_lot','=',False), ('group_stock_tracking_lot','=',False)]}"/>
-                    <newline/>
-                    <field name="group_stock_tracking_lot"/>
+                <form string ="Configure Warehouse" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Traceability" colspan="4"/>
+                        <field name="group_stock_production_lot"/>
+                        <field name="module_product_expiry"
+                            attrs="{'invisible': [('group_stock_production_lot','=',False), ('group_stock_tracking_lot','=',False)]}"/>
+                        <newline/>
+                        <field name="group_stock_tracking_lot"/>
 
-                    <separator string="Logistics" colspan="4"/>
-                    <field name="group_stock_multiple_locations"/>
-                    <field name="module_stock_no_autopicking"/>
-                    <field name="module_stock_location"/>
-                    <field name="module_stock_invoice_directly"/>
+                        <separator string="Logistics" colspan="4"/>
+                        <field name="group_stock_multiple_locations"/>
+                        <field name="module_stock_no_autopicking"/>
+                        <field name="module_stock_location"/>
+                        <field name="module_stock_invoice_directly"/>
 
-                    <separator string="Products" colspan="4"/>
-                    <field name="group_stock_packaging"/>
-                    <field name="group_stock_inventory_valuation"/>
-                    <field name="group_uom"/>
-                    <field name="group_uos"/>
+                        <separator string="Products" colspan="4"/>
+                        <field name="group_stock_packaging"/>
+                        <field name="group_stock_inventory_valuation"/>
+                        <field name="group_uom"/>
+                        <field name="group_uos"/>
 
-                    <separator string="Partners" colspan="4"/>
-                    <field name="module_claim_from_delivery"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Partners" colspan="4"/>
+                        <field name="module_claim_from_delivery"/>
+                    </sheet>
                 </form>
             </field>
         </record>

From d0781ecc2696964736304ec1575242603e417580 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 13:50:18 +0200
Subject: [PATCH 30/90] crm.lead opportunities

bzr revid: al@openerp.com-20120410115018-6gjzyvod3tqn6z05
---
 addons/crm/crm_lead_view.xml | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 70fabfc05b5..7a985c94b71 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -131,9 +131,6 @@
                     </group>
                     <separator colspan="4" string="Notes"/>
                     <field name="description" nolabel="1" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                    </group>
                  </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
@@ -401,7 +398,20 @@
         <field name="type">form</field>
         <field name="priority">20</field>
         <field name="arch" type="xml">
-            <form string="Opportunities">
+            <form string="Opportunities" layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
+                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
+                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
                 <group colspan="4" col="7">
                     <field name="name"  required="1" string="Opportunity"/>
                     <label string="Stage:" align="1.0"/>
@@ -468,18 +478,6 @@
 
                     <separator colspan="4" string="Details"/>
                     <field name="description" nolabel="1" colspan="4"/>
-
-                    <separator colspan="4"/>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                        <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
-                        <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                        <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
-                        <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
-                    </group>
                 </page>
                 <page string="Lead">
                     <group colspan="2" col="4">
@@ -524,7 +522,10 @@
                     <field name="ref2"/>
                 </page>
                 </notebook>
-                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
             </form>
         </field>
     </record>

From e485c73d152dd6e2ce4964214d83cf1cca0cbf24 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 15:10:52 +0200
Subject: [PATCH 31/90] [IMP] base: new form view of res.partner

bzr revid: qdp-launchpad@openerp.com-20120410131052-8zj77cfa2ulkhiup
---
 openerp/addons/base/res/res_partner_view.xml | 91 ++++++++++++++++----
 1 file changed, 75 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index ffbbca3eb74..156abbabe85 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -333,25 +333,22 @@
             <field name="arch" type="xml">
                 <form string="Partners">
                     <group col="8" colspan="4">
-                        <group col="4" colspan="4">
-                            <field name="name" required="1"/>
-                            <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
-                            <newline/>
-                            <field name="function" attrs="{'invisible': [('is_company', '=', True)]}" colspan="4"/>
-                            <field name="parent_id" string="Company" colspan="4" attrs="{'invisible': [('is_company','=', True)]}"
-                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                on_change="onchange_address(use_parent_address, parent_id)"/>
+                        <group col="2">
+                            <field name="photo" widget='image' nolabel="1"/>
+                        </group>
+                        <group colspan="4">
+                            <h2><field name="name" required="1" nolabel="1" colspan="4"/></h2><newline/>
+                                <field name="function" attrs="{'invisible': [('is_company', '=', True)]}"/>
+                                <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
+                                <field name="parent_id" string="Company" attrs="{'invisible': [('is_company','=', True)]}"
+                                    domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
+                                    on_change="onchange_address(use_parent_address, parent_id)"/>
                         </group>
                         <group col="2">
                             <field name="is_company" on_change="onchange_type(is_company)"/>
-                        </group>
-                        <group col="2">
                             <field name="customer"/>
                             <field name="supplier"/>
                         </group>
-                        <group col="2">
-                            <field name="photo" widget='image' nolabel="1"/>
-                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -372,7 +369,6 @@
                             </group>
                             <group colspan="2">
                                 <separator string="Communication" colspan="4"/>
-                                <field name="lang" colspan="4"/>
                                 <field name="phone" colspan="4"/>
                                 <field name="mobile" colspan="4"/>
                                 <field name="fax" colspan="4"/>
@@ -381,7 +377,69 @@
                                 <field name="ref" groups="base.group_extended" colspan="4"/>
                             </group>
                             <group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
-                                <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1">
+                                <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban">
+                <kanban>
+                    <field name="color"/>
+                    <field name="name"/>
+                    <field name="title"/>
+                    <field name="email"/>
+                    <field name="parent_id"/>
+                    <field name="is_company"/>
+                    <field name="function"/>
+                    <field name="phone"/>
+                    <field name="street"/>
+                    <field name="street2"/>
+                    <field name="photo"/>
+                    <field name="zip"/>
+                    <field name="city"/>
+                    <field name="country_id"/>
+                    <field name="mobile"/>
+                    <field name="state_id"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
+                            <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                                <div class="oe_module_vignette">
+                                <a type="edit">
+                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" width="64" height="64" class="oe_module_icon"/>
+                                </a>
+                                    <div class="oe_module_desc">
+                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                            <table class="oe_kanban_table">
+                                                <tr>
+                                                    <td class="oe_kanban_title1" align="left" valign="middle">
+                                                        <h4><a type="edit"><field name="name"/></a>
+                                                            <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
+                                                        </h4>
+                                                            <i>
+															<div t-if="record.function.raw_value">
+                                                            <field name="function"/><br/></div>
+															<div t-if="record.email.raw_value">
+                                                            <field name="email"/><br/></div>
+</i>
+                                                    </td>
+                                                    <td t-if="record.is_company.raw_value" valign="top" align="right">
+                                                        <!--img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_gravatar"/-->
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </div>
+                                        <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
+                                            <div class="oe_kanban_left">
+                                                <a string="Edit" icon="gtk-edit" type="edit"/>
+                                                <a string="Change Color" icon="color-picker" type="color" name="color"/>
+                                                <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
+                                                    <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
+                                                </a>
+                                            </div>
+                                            <br class="oe_kanban_clear"/>
+                                    </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
                                 <form string="Partners">
                                     <group col="8" colspan="4">
                                         <group col="4" colspan="4">
@@ -404,7 +462,7 @@
                                             <field name="photo" widget='image' nolabel="1"/>
                                         </group>
                                     </group>
-                            <notebook colspan="4">
+                                <notebook colspan="4">
                                 <page string="General">
                                     <group colspan="2">
                                         <separator string="Address" colspan="4"/>
@@ -452,6 +510,7 @@
                         </page>
                         <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
                             <separator string="General Information" colspan="4"/>
+                            <field name="lang" colspan="4"/>
                             <field name="user_id"/>
                             <field name="active" groups="base.group_extended"/>
                             <field name="date"/>

From 4528c74a5025b1961d0e51af00202d55175042c0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 15:20:43 +0200
Subject: [PATCH 32/90] hr_recruitment form

bzr revid: al@openerp.com-20120410132043-te2ntv8nvcf9lwt7
---
 addons/hr_recruitment/hr_recruitment_view.xml | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4a438a1f385..9b48c3057cc 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -73,7 +73,18 @@
         <field name="model">hr.applicant</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Jobs - Recruitment Form">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
+                <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
+                <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
+                <div class="oe_right">
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </div>
+            </div>
+            <sheet string="Jobs - Recruitment Form" layout="auto">
                 <group colspan="4" col="8">
                         <field name="name" string="Subject"/>
                         <field name="partner_name"/>
@@ -126,21 +137,15 @@
                             <field name="source_id"/>
                             <field name="reference"/>
                         </group>
-                        <separator colspan="4" string="Status"/>
-                        <group col="8" colspan="4">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                            <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                            <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                            <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
-                            <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
-                            <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                        </group>
                    </page>
                  <page string="Notes">
                      <field name="description" nolabel="1" colspan="4"/>
                  </page>
                 </notebook>
+            </sheet>
+            <div class="oe_form_sheet_width">
                 <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+            </div>
             </form>
         </field>
     </record>

From ee747dc954bf369673f5590b995ea0a8f5cf18f7 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 15:48:13 +0200
Subject: [PATCH 33/90] embbded kanban view

bzr revid: al@openerp.com-20120410134813-c0potdev7a1i63tf
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c94a8a51e26..313c96a9fb4 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1651,7 +1651,7 @@ class BaseModel(object):
                     children = False
                     views = {}
                     for f in node:
-                        if f.tag in ('form', 'tree', 'graph'):
+                        if f.tag in ('form', 'tree', 'graph', 'kanban'):
                             node.remove(f)
                             ctx = context.copy()
                             ctx['base_model_name'] = self._name

From 11fe6c8af91c144d53be3a225bebdd7c63d7607e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 16:05:57 +0200
Subject: [PATCH 34/90] dashboard use manual layout

bzr revid: al@openerp.com-20120410140557-ewqp43oncnd215im
---
 addons/account/board_account_view.xml             | 2 +-
 addons/board/board_data_admin.xml                 | 2 +-
 addons/board/board_data_home.xml                  | 2 +-
 addons/crm/board_crm_view.xml                     | 2 +-
 addons/document/board_document_view.xml           | 4 ++--
 addons/event/board_association_view.xml           | 2 +-
 addons/hr/hr_board.xml                            | 4 ++--
 addons/mrp/board_manufacturing_view.xml           | 2 +-
 addons/project/board_project_view.xml             | 2 +-
 addons/project_issue/board_project_issue_view.xml | 2 +-
 addons/project_scrum/board_project_scrum_view.xml | 2 +-
 addons/purchase/board_purchase_view.xml           | 2 +-
 addons/sale/board_sale_view.xml                   | 4 ++--
 addons/stock/board_warehouse_view.xml             | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 6417bb99d88..fa6dac769a3 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -38,7 +38,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Board">
+                <form string="Account Board" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index 5f8c2f1b05c..58e04a22c09 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -32,7 +32,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Administration Dashboard">
+                <form string="Administration Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(board_config_overview)d" string="Configuration Overview"/>
diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
index 8a75a3ad496..8794173810a 100644
--- a/addons/board/board_data_home.xml
+++ b/addons/board/board_data_home.xml
@@ -43,7 +43,7 @@
       <field name="model">board.board</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="">
+        <form string="" layout="manual">
           <board style="1">
             <column>
               <action name="%(action_application_tiles)d"/>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 5d64bf20093..bc0b41b24b9 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -98,7 +98,7 @@
                <field name="model">board.board</field>
                <field name="type">form</field>
                <field name="arch" type="xml">
-                    <form string="Sales Dashboard">
+                    <form string="Sales Dashboard" layout="manual">
                          <board style="2-1">
                             <column>
                                 <action string="My Opportunities"
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 4412423c97b..27325662815 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -6,7 +6,7 @@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Document board">
+                <form string="Document board" layout="manual">
                      <board style="2-1" >
                         <column>
                             <action string="New Files"
@@ -57,7 +57,7 @@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Document board">
+                <form string="Document board" layout="manual">
                      <board style="2-1">
                         <column>
                             <action string="Wall of Shame"
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 96db3db6781..72b46a74116 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -39,7 +39,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Association Dashboard">
+                <form string="Association Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action string="Next Events"
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index 6b541f5a557..b026b40bd80 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -7,7 +7,7 @@
         <field name="model">board.board</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Board">
+            <form string="My Board" layout="manual">
                 <board style="2-1">
                     <column/>
                     <column/>
@@ -35,7 +35,7 @@
         <field name="model">board.board</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="HR Manager Board">
+            <form string="HR Manager Board" layout="manual">
                 <board style="2-1">
                     <column/>
                     <column/>
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index cb81d51d439..514b018032a 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -6,7 +6,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manufacturing board">
+                <form string="Manufacturing board" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index f4a855283ba..8fef3c1470e 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -80,7 +80,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
+                <form string="My Board" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index ff33793d8e8..c6a9da9cb41 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -56,7 +56,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issues Dashboard">
+                <form string="Issues Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 924a1cbf5cc..284208ee21f 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -75,7 +75,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
+                <form string="My Board" layout="manual">
                     <board style="2-1">
                         <column>
                				 <action name="%(action_sprint_all_dashboard_tree)d" string="Sprints"/>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 4c9e776b96b..ad4c97aad4a 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -88,7 +88,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Dashboard">
+                <form string="Purchase Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(purchase_draft)d" string="Request for Quotations" creatable="true"/>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 8a6caf1a849..3780c68b2b3 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -6,7 +6,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Manager Dashboard">
+                <form string="Sales Manager Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
@@ -99,7 +99,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Dashboard">
+                <form string="Sales Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(action_quotation_for_sale)d"
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index b8de9cf445e..b99b7e98609 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -44,7 +44,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Warehouse board">
+                <form string="Warehouse board" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(action_incoming_product_board)d" string="Incoming Shipments" creatable="true"/>

From 0d2ba40cf8cbe3adc2d37bf6e1e341068c148539 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 10 Apr 2012 16:09:55 +0200
Subject: [PATCH 35/90] [IMP] hr.config.settings: simplify form, remove all
 buttons

bzr revid: rco@openerp.com-20120410140955-a8m0oxigpy7rb1bu
---
 addons/hr/res_config_view.xml                 | 21 -------------------
 .../hr_evaluation/hr_evaluation_installer.xml | 16 --------------
 .../hr_expense/hr_expense_installer_view.xml  | 16 --------------
 addons/hr_holidays/hr_holidays_view.xml       | 16 --------------
 addons/hr_recruitment/res_config_view.xml     |  6 ------
 addons/hr_timesheet_sheet/res_config_view.xml |  6 ------
 6 files changed, 81 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index ad8d5572466..3377ad20c37 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,30 +20,9 @@
                     </div>
                     <sheet layout="auto">
                         <separator string="Human Resources" colspan="4"/>
-                        <label string="Departments :"/>
-                        <label colspan="1"/>
-                        <group colspan="2">
-                            <button name="%(view_department_form_installer)d" string="Create Your Departments"
-                                type="action" icon="terp-personal+"/>
-                        </group>
-                        <newline/>
-                        <label string="Employees :" />
-                        <label colspan="1"/>
-                        <group colspan="2">
-                            <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
-                                type="action" icon="terp-personal"/>
-                        </group>
-                        <newline/>
                         <field name="module_hr_timesheet_sheet"/>
                         <newline/>
                         <field name="module_hr_holidays"/>
-                        <newline/>
-                        <label string="Salary Rules :"/>
-                        <label colspan="1"/>
-                        <group colspan="2">
-                            <button string="Configure Your Salary Rules" icon="gtk-go-forward"
-                                name="%(open_payroll1_modules)d" type="action" />
-                        </group>
 
                         <separator string="Additional Features" colspan="4"/>
                         <field name="module_hr_expense"/>
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
index c8ac9050368..5c0ca4841ed 100644
--- a/addons/hr_evaluation/hr_evaluation_installer.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -10,21 +10,5 @@
             <field name="help">You can define appraisal plans (ex: first interview after 6 months, then every year). Then, each employee can be linked to an appraisal plan so that OpenERP can automatically generate interview requests to managers and/or subordinates.</field>
         </record>
 
-        <!-- Hr Configuration wizard -->
-        <record id="view_evaluation_config_wizard_inherit" model="ir.ui.view">
-            <field name="name">hr settings for evaluations</field>
-            <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
-            <field name="arch" type="xml">
-                <field name="module_hr_evaluation" position="after">
-                    <group colspan="2">
-                        <button name="%(action_evaluation_plans_installer)d" string="Review Appraisal Plans"
-                            type="action" icon="terp-stock_align_left_24"/>
-                    </group>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index aa9b551df6c..baabddea059 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -27,21 +27,5 @@
            <field name="help">Define one product for each expense type allowed for an employee (travel by car, hostel, restaurant, etc). If you reimburse the employees at a fixed rate, set a cost and a unit of measure on the product. If you reimburse based on real costs, set the cost at 0.00. The user will set the real price when recording his expense sheet.</field>
        </record>
 
-        <!-- Hr Configuration wizard -->
-        <record id="view_expenseconfig_wizard_inherit" model="ir.ui.view">
-            <field name="name">hr settings for expenses</field>
-            <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
-            <field name="arch" type="xml">
-                <field name="module_hr_expense" position="after">
-                    <group colspan="2">
-                        <button name="%(product_normal_form_view_installer)d" string="Review Expenses Products"
-                            type="action" icon="terp-accessories-archiver"/>
-                    </group>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9cb7c4d6a32..d6ee7ed869c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -485,22 +485,6 @@
            <field name="help">You can assign remaining Legal Leaves for each employee, OpenERP will automatically create and validate allocation requests.</field>
        </record>
 
-        <!-- Hr Configuration wizard -->
-        <record id="view_config_wizard_inherit" model="ir.ui.view">
-            <field name="name">hr settings for holidays</field>
-            <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
-            <field name="arch" type="xml">
-                <field name="module_hr_holidays" position="after">
-                    <group colspan="2">
-                        <button name="%(hr_holidays.hr_holidays_leaves_assign_legal)d" string="Allocate Leaves"
-                            type="action" icon="gtk-apply"/>
-                    </group>
-                </field>
-            </field>
-        </record>
-
         <!-- Hr employee inherit Legal Leaves -->
 
         <record id="view_employee_form_leave_inherit" model="ir.ui.view">
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index d056d493e2b..32575a4726d 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,12 +7,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_hr_recruitment" position="after">
-                    <group colspan="2">
-                        <button name="%(hr_recruitment_stage_form_installer)d" string="Review Recruitment Stages"
-                            type="action" icon="terp-stage"/>
-                    </group>
-                </field>
                 <group name="config_recruitment" position="after">
                     <separator  string="Recruitment" colspan="4"/>
                     <field name="module_document_ftp"/>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index bd4142d7916..c789bd5106e 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -7,12 +7,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_hr_timesheet_sheet" position="after">
-                    <group colspan="2">
-                        <button name="%(hr_timesheet.action_define_analytic_structure)d" string="Create Your Timesheet Accounts"
-                            type="action" icon="terp-folder-green"/>
-                    </group>
-                </field>
                 <group name="config_timesheets" position="after">
                     <separator string="Timesheets" colspan="4"/>
                     <field name="timesheet_range"/>

From e6a10c0825d077b2af5318d6e4c40ef176f9a8d5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 16:29:33 +0200
Subject: [PATCH 36/90] [IMP] base: form view of res.partner

bzr revid: qdp-launchpad@openerp.com-20120410142933-uwcbibbaz5qyo6g7
---
 openerp/addons/base/res/res_partner_view.xml | 31 ++++++--------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 156abbabe85..ee8789f534e 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -377,7 +377,7 @@
                                 <field name="ref" groups="base.group_extended" colspan="4"/>
                             </group>
                             <group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
-                                <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban">
+                            <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban,list">
                 <kanban>
                     <field name="color"/>
                     <field name="name"/>
@@ -401,39 +401,26 @@
                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
                                 <div class="oe_module_vignette">
                                 <a type="edit">
-                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" width="64" height="64" class="oe_module_icon"/>
+                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar"/>
                                 </a>
                                     <div class="oe_module_desc">
                                         <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
                                             <table class="oe_kanban_table">
                                                 <tr>
                                                     <td class="oe_kanban_title1" align="left" valign="middle">
-                                                        <h4><a type="edit"><field name="name"/></a>
-                                                            <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
-                                                        </h4>
-                                                            <i>
-															<div t-if="record.function.raw_value">
-                                                            <field name="function"/><br/></div>
-															<div t-if="record.email.raw_value">
-                                                            <field name="email"/><br/></div>
-</i>
+                                                        <h4><a type="edit"><field name="name"/></a></h4>
+                                                        <i><div t-if="record.function.raw_value">
+                                                            <field name="function"/><br/></div></i>
                                                     </td>
-                                                    <td t-if="record.is_company.raw_value" valign="top" align="right">
+                                                    <td valign="top" align="right">
+                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
+                                                            <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
+                                                        </a>
                                                         <!--img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_gravatar"/-->
                                                     </td>
                                                 </tr>
                                             </table>
                                         </div>
-                                        <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                            <div class="oe_kanban_left">
-                                                <a string="Edit" icon="gtk-edit" type="edit"/>
-                                                <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                                <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
-                                                    <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
-                                                </a>
-                                            </div>
-                                            <br class="oe_kanban_clear"/>
-                                    </div>
                                     </div>
                                 </div>
                             </div>

From ea5ece169b7ae506121766698bd7785da9b49cfe Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 10 Apr 2012 16:32:37 +0200
Subject: [PATCH 37/90] [FIX]: delivery: fixed problem of wrong reference in
 inherited view

bzr revid: rpa@tinyerp.com-20120410143237-mojjdxujwttbp4ay
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index b03d9cd4d79..83e591b6f01 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -304,7 +304,7 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                    <xpath expr="//button[@name='button_dummy']" position="after">
+                    <xpath expr="//button[@name='order_confirm']" position="after">
                          <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
                     </xpath>
             </field>

From 9d4d95013bf883e704db8e55f0d5c5b2ab5e052a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 16:47:21 +0200
Subject: [PATCH 38/90] [IMP] base: form view of res.partner

bzr revid: qdp-launchpad@openerp.com-20120410144721-fq7jo6fgci8krlms
---
 openerp/addons/base/res/res_partner_view.xml | 164 ++++++-------------
 1 file changed, 49 insertions(+), 115 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index ee8789f534e..05ab1c0a945 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -378,121 +378,55 @@
                             </group>
                             <group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
                             <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban,list">
-                <kanban>
-                    <field name="color"/>
-                    <field name="name"/>
-                    <field name="title"/>
-                    <field name="email"/>
-                    <field name="parent_id"/>
-                    <field name="is_company"/>
-                    <field name="function"/>
-                    <field name="phone"/>
-                    <field name="street"/>
-                    <field name="street2"/>
-                    <field name="photo"/>
-                    <field name="zip"/>
-                    <field name="city"/>
-                    <field name="country_id"/>
-                    <field name="mobile"/>
-                    <field name="state_id"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
-                            <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
-                                <div class="oe_module_vignette">
-                                <a type="edit">
-                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar"/>
-                                </a>
-                                    <div class="oe_module_desc">
-                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
-                                            <table class="oe_kanban_table">
-                                                <tr>
-                                                    <td class="oe_kanban_title1" align="left" valign="middle">
-                                                        <h4><a type="edit"><field name="name"/></a></h4>
-                                                        <i><div t-if="record.function.raw_value">
-                                                            <field name="function"/><br/></div></i>
-                                                    </td>
-                                                    <td valign="top" align="right">
-                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
-                                                            <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
-                                                        </a>
-                                                        <!--img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_gravatar"/-->
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>
-                                <form string="Partners">
-                                    <group col="8" colspan="4">
-                                        <group col="4" colspan="4">
-                                            <field name="name" required="1"/>
-                                            <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
-                                            <newline/>
-                                            <field name="function" attrs="{'invisible': [('is_company', '=', True)]}" colspan="4"/>
-                                            <field name="parent_id" string="Company" colspan="4" attrs="{'invisible': [('is_company','=', True)]}"
-                                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                                on_change="onchange_address(use_parent_address, parent_id)" invisible="1"/>
-                                        </group>
-                                        <group col="2">
-                                            <field name="is_company" on_change="onchange_type(is_company)" invisible="1"/>
-                                        </group>
-                                        <group col="2">
-                                            <field name="customer"/>
-                                            <field name="supplier"/>
-                                        </group>
-                                        <group col="2">
-                                            <field name="photo" widget='image' nolabel="1"/>
-                                        </group>
-                                    </group>
-                                <notebook colspan="4">
-                                <page string="General">
-                                    <group colspan="2">
-                                        <separator string="Address" colspan="4"/>
-                                        <field name="type" string="Type" attrs="{'invisible': [('is_company','=', True)]}"/>
-                                        <group colspan="2">
-                                            <field name="use_parent_address" attrs="{'invisible': [('is_company','=', True)]}" on_change="onchange_address(use_parent_address, parent_id)"/>
-                                        </group>
-                                        <newline/>
-                                            <field name="street" colspan="4"/>
-                                            <field name="street2" colspan="4"/>
-                                            <field name="zip"/>
-                                            <field name="city"/>
-                                            <field name="country_id"/>
-                                            <field name="state_id"/>
-                                        </group>
-                                        <group colspan="2">
-                                            <separator string="Communication" colspan="4"/>
-                                            <field name="lang" colspan="4"/>
-                                            <field name="phone" colspan="4"/>
-                                            <field name="mobile" colspan="4"/>
-                                            <field name="fax" colspan="4"/>
-                                            <field name="email" widget="email" colspan="4"/>
-                                            <field name="website" widget="url" colspan="4"/>
-                                            <field name="ref" groups="base.group_extended" colspan="4"/>
-                                        </group>
-                                    </page>
-                                    <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
-                                        <separator string="General Information" colspan="4"/>
-                                            <field name="user_id"/>
-                                            <field name="active" groups="base.group_extended"/>
-                                            <field name="date"/>
-                                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                        <newline/>
-                                    </page>
-                                    <page string="Categories" groups="base.group_extended">
-                                        <field name="category_id" colspan="4" nolabel="1"/>
-                                    </page>
-                                    <page string="Notes">
-                                        <field name="comment" colspan="4" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                                </field>
+                                <kanban>
+                                    <field name="color"/>
+                                    <field name="name"/>
+                                    <field name="title"/>
+                                    <field name="email"/>
+                                    <field name="parent_id"/>
+                                    <field name="is_company"/>
+                                    <field name="function"/>
+                                    <field name="phone"/>
+                                    <field name="street"/>
+                                    <field name="street2"/>
+                                    <field name="photo"/>
+                                    <field name="zip"/>
+                                    <field name="city"/>
+                                    <field name="country_id"/>
+                                    <field name="mobile"/>
+                                    <field name="state_id"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
+                                            <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                                                <div class="oe_module_vignette">
+                                                <a type="edit">
+                                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar"/>
+                                                </a>
+                                                    <div class="oe_module_desc">
+                                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                                            <table class="oe_kanban_table">
+                                                                <tr>
+                                                                    <td class="oe_kanban_title1" align="left" valign="middle">
+                                                                        <h4><a type="edit"><field name="name"/></a></h4>
+                                                                        <i><div t-if="record.function.raw_value">
+                                                                            <field name="function"/><br/></div></i>
+                                                                    </td>
+                                                                    <td valign="top" align="right">
+                                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
+                                                                            <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
+                                                                        </a>
+                                                                    </td>
+                                                                </tr>
+                                                            </table>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                            </field>
                             </group>
                         </page>
                         <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">

From 8b83ecaaee5fafb3788c9e444c62fbc90b128fd4 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 17:10:54 +0200
Subject: [PATCH 39/90] [IMP] temporary improvement of form view of partner

bzr revid: qdp-launchpad@openerp.com-20120410151054-4g6ex2v7o9llt2e2
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 05ab1c0a945..f2861b7786f 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -401,7 +401,7 @@
                                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
                                                 <div class="oe_module_vignette">
                                                 <a type="edit">
-                                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar"/>
+                                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar oe_kanban_avatar_toto"/>
                                                 </a>
                                                     <div class="oe_module_desc">
                                                         <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">

From a936f27674f7ae929ab7c3190c871c65a9b48082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Apr 2012 18:01:00 +0200
Subject: [PATCH 40/90] [FIX] share and mail.thread: tweaked access rights.
 (TODO: second part of patch: checking access rights to email should check
 those from its master record, like attachments. Will be done shortly after
 the CD.)

bzr revid: tde@openerp.com-20120410160100-lh4jr3ubkvemggvk
---
 addons/base_calendar/security/ir.model.access.csv | 2 +-
 addons/mail/security/ir.model.access.csv          | 9 +++++----
 addons/share/wizard/share_wizard.py               | 6 +++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 3dac47653f2..34543f0e912 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_calendar_attendee,calendar.attendee,model_calendar_attendee,base.group_user,1,1,1,1
+access_calendar_attendee,calendar.attendee,model_calendar_attendee,,1,1,1,1
 access_calendar_alarm,calendar.alarm,model_calendar_alarm,base.group_user,1,1,1,1
 access_res_alarm,res.alarm,model_res_alarm,base.group_user,1,1,1,1
 access_calendar_todo,calendar.todo,model_calendar_todo,base.group_user,1,1,1,1
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index c305de830c0..3cfd4e88f3d 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,7 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message,mail.message,model_mail_message,base.group_user,1,1,1,1
+access_mail_message,mail.message,model_mail_message,,1,0,1,0
+access_mail_message_all,mail.message.all,model_mail_message,base.group_user,1,1,1,1
 access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
-access_mail_subscription,mail.subscription,model_mail_subscription,base.group_user,1,1,1,1
-access_mail_notification,mail.notification,model_mail_notification,base.group_user,1,1,1,1
+access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
+access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
-access_mail_message_report,mail.message.report,model_mail_message_report,base.group_user,1,0,0,0
+access_mail_message_report,mail.message.report,model_mail_message_report,,1,0,0,0
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 854f021bf67..07004f333a8 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -189,7 +189,7 @@ class share_wizard(osv.osv_memory):
         'invite': False,
         'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
         'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
-        'access_mode': 'readonly',
+        'access_mode': 'readwrite',
         'embed_option_title': True,
         'embed_option_search': True,
     }
@@ -502,6 +502,8 @@ class share_wizard(osv.osv_memory):
         # Create required rights if allowed by current user rights and not
         # already granted
         for dummy, model in fields_relations:
+            # mail.message is transversal: it should not received directly the access rights
+            if model.model in ['mail.message']: continue
             values = {
                 'name': _('Copied access for sharing'),
                 'group_id': group_id,
@@ -632,6 +634,8 @@ class share_wizard(osv.osv_memory):
             domain = safe_eval(wizard_data.domain)
             if domain:
                 for rel_field, model in fields_relations:
+                    # mail.message is transversal: it should not received directly the access rights
+                    if model.model in ['mail.message']: continue
                     related_domain = []
                     if not rel_field: continue
                     for element in domain:

From 6d84bb78996667f26aa0617ba429b9d1b96b538e Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Apr 2012 18:14:24 +0200
Subject: [PATCH 41/90] restyling of wall and chatter

bzr revid: mit@openerp.com-20120410161424-pdgx77dn0o7t31am
---
 addons/mail/static/src/css/mail.css | 65 +++++++++++++++++++----------
 addons/mail/static/src/js/mail.js   |  2 +-
 addons/mail/static/src/xml/mail.xml | 13 +++---
 3 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d920455537f..694de02a5cb 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -4,17 +4,23 @@
 
 div.oe_mail_wall {
     overflow: auto;
-    padding: 5px;
+    padding: 0;
+    background: white;
 }
 
-div.oe_mail_wall_search {
-    width: 55%;
+/*div.oe_mail_wall_search {*/
+    /*width: 550px;*/
+/*}*/
+
+.oe_mail_wall_button_comment {
+    float: right;
 }
 
 /* 2 columns view */
 div.oe_mail_wall_left {
     float: left;
-    width: 65%;
+    width: 560px;
+    margin: 8px;
 }
 
 div.oe_mail_wall_right {
@@ -22,6 +28,10 @@ div.oe_mail_wall_right {
     width: 34%;
 }
 
+.oe_mail_wall_threads {
+    margin-top: 8px;
+}
+
 .oe_mail_wall_thread div.oe_mail_thread_act .oe_mail_action_textarea, div.oe_mail_thread_subthread .oe_mail_action_textarea {
     height: 20px;
     padding: 2px;
@@ -47,16 +57,15 @@ div.oe_mail_wall_more {
 
 .oe_mail_recthread {
     overflow: auto;
-    padding: 5px 5px 5px 5px;
 }
 
 /* Left-side CSS */
 .oe_mail_recthread_actions {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
 }
 
 .oe_mail_recthread_followers {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
 }
 
 .oe_mail_followers_action, .oe_mail_followers_display {
@@ -70,21 +79,16 @@ div.oe_mail_wall_more {
 
 .oe_mail_recthread_right {
     float: right;
-    width: 25%;
-    margin-right: 5%;
+    width: 240px;
 }
 
 .oe_mail_button_follow, .oe_mail_button_unfollow {
-    width: 120px;
+    /*width: 120px;*/
 }
 
 .oe_mail_button_followers {
-    display: inline;
-    width: 120px;
-}
-
-.oe_mail_followers h4 {
-    margin: 0 0 8px;
+    display: inline-block;
+    width: 240px;
 }
 
 /* ------------------------------ */
@@ -99,7 +103,7 @@ div.oe_mail_thread_act {
 
 div.oe_mail_thread_display {
     white-space: normal;
-    margin-bottom: 5px;
+    /*margin-bottom: 5px;*/
 }
 
 div.oe_mail_thread_subthread {
@@ -116,8 +120,7 @@ li.oe_mail_thread_msg {
     padding: 1px;
 }
 
-.notification, .email {
-    background: #E0E0E0;
+.notification, .comment {
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -126,8 +129,16 @@ li.oe_mail_thread_msg {
     border-radius: 4px;
 }
 
-.comment {
-    padding: 4px;
+.oe_mail_thread_msg > .comment {
+    background: #eee;
+}
+
+.oe_mail_thread_subthread .comment {
+    background: white;
+}
+
+.notification {
+    background: #eee;
 }
 
 .notification:after, .email:after, .comment:after {
@@ -215,6 +226,14 @@ input.oe_mail, textarea.oe_mail {
     border-radius: 3px;
 }
 
+.oe_mail_wall .oe_mail_wall_act textarea {
+    width: 550px;
+}
+
+textarea.oe_mail {
+    height: 60px;
+}
+
 input.oe_mail:focus, textarea.oe_mail:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
@@ -246,6 +265,10 @@ p.oe_mail_msg {
     font-weight: bold;
 }
 
+.oe_mail_msg_reply, .oe_mail_msg_delete {
+    margin-right: 4px;
+}
+
 a.oe_mail_oe_intlink {
     color: #8786b7;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fc6cb833d4b..fcf02aafddd 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -638,7 +638,7 @@ openerp.mail = function(session) {
         load_search_view: function (view_id, defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('div.oe_mail_wall_search'));
+            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_row'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 0f49902b6b3..271064db358 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,13 +2,17 @@
 <template>
 
     <div t-name="Wall" class="oe_mail_wall">
-        <div class="oe_mail_wall_search">
+        <div class="oe_view_manager_header">
+            <div class="oe_view_manager_row">
+                <h2 class="oe_view_title">All Feeds</h2>
+            </div>
         </div>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
-                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br />
+                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
                 <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
+            <div class="oe_clear"></div>
             <div class="oe_mail_wall_threads">
             </div>
             <div class="oe_mail_wall_more">
@@ -65,7 +69,6 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
             <br />
@@ -73,9 +76,9 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
-            <t t-if="display['show_reply']"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a></span></t>
+            <t t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
             <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a></span></t>
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
             </t>
             <t t-if="display['show_hide']">
                 <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>

From cf4668b83145ac5c894feca5515e9cba48c86575 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Apr 2012 18:40:16 +0200
Subject: [PATCH 42/90] styling of hover of follow button

bzr revid: mit@openerp.com-20120410164016-sr3wq13lo6d02l9e
---
 addons/mail/static/src/css/mail.css | 8 ++++++++
 addons/mail/static/src/js/mail.js   | 6 ++++--
 addons/mail/static/src/xml/mail.xml | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 694de02a5cb..260b4a230cd 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -280,3 +280,11 @@ a.oe_mail_oe_intlink {
 .oe_mail_oe_space {
     margin-left: 15px;
 }
+
+
+
+
+.oe_mail_recthread_actions button {
+    width: 120px;
+}
+
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fcf02aafddd..20ff72645a2 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -485,9 +485,11 @@ openerp.mail = function(session) {
             // bind buttons
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow'); }).mouseleave(function () { $(this).html('Not following'); });
+                .mouseover(function () { $(this).html('Follow').addClass('following'); })
+                .mouseleave(function () { $(this).html('Not following').removeClass('following'); });
             this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow'); }).mouseleave(function () { $(this).html('Following'); });
+                .mouseover(function () { $(this).html('Unfollow').removeClass('following').addClass('unfollow'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('unfollow').addClass('following'); });
             this.reinit();
         },
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 271064db358..a0133695659 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -32,7 +32,7 @@
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow">Not following</button>
-                <button type="button" class="oe_mail_button_unfollow">Following</button>
+                <button type="button" class="oe_mail_button_unfollow following">Following</button>
                 <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
             <div class="oe_mail_recthread_followers">

From aaaf9372ffe11019d41253aebd8f9c8d8836a771 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 18:25:55 +0200
Subject: [PATCH 43/90] project task and project

bzr revid: al@openerp.com-20120410162555-qg81a29b3wsw5cbh
---
 addons/project/project_view.xml | 64 ++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c321c3919a7..c48b075721a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,7 +18,20 @@
             <field name="model">project.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project">
+                <form string="Project" layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
+                    </div>
+                </div>
+                <sheet string="Project" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
                         <field name="analytic_account_id" invisible="1" required="0"/>
@@ -43,21 +56,6 @@
                                 <field name="priority"/>
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
-                            <newline/>
-                            <separator colspan="4"/>
-                            <group col="9" colspan="8">
-                                <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
-                                <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-                                <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
-                                <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
-                                <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                                <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
-                                <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                                <button
-                                    string="New Project Based on Template"
-                                    name="duplicate_template"  type="object"
-                                    states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
-                            </group>
                         </page>
                         <page string="Members">
                             <field colspan="4" name="members" nolabel="1">
@@ -96,7 +94,10 @@
                         </page>
                     </notebook>
                     <newline/>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -221,7 +222,20 @@
             <field name="type">form</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Task edition">
+                <form string="Project" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
+                        <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
+                        <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
+                        <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
+                        <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
+                        <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
+                        <div class="oe_right">
+                            <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
+                        </div>
+                    </div>
+                    <sheet string="Task edition" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"  on_change="onchange_project(project_id)"/>
@@ -256,17 +270,6 @@
                                     <field name="date" />
                                 </tree>
                             </field>
-                            <newline/>
-                            <group col="11" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
-                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-                                <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
-                                <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
-                                <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
-                                <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                                <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                                <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
-                            </group>
                         </page>
                         <page groups="base.group_extended" string="Delegations History">
                             <separator string="Parent Tasks" colspan="4"/>
@@ -304,7 +307,10 @@
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </sheet>
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>

From 0dd966ed7cc8e5b008e8fe205b71959330a64b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Apr 2012 21:32:01 +0200
Subject: [PATCH 44/90] [IMP] Thread widget: record name appears for first
 message of thread.

bzr revid: tde@openerp.com-20120410193201-q04ycx52fkfzycn9
---
 addons/mail/static/src/xml/mail.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a0133695659..d97f0738629 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -69,6 +69,9 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
+            <t t-if="params.thread_level > 0">
+                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
             <br />
@@ -88,6 +91,10 @@
     
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
+            <t t-if="params.thread_level > 0">
+                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            </t>
+            <br />
             <span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
             <span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br />
             <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
@@ -95,6 +102,13 @@
         <p class="oe_mail_msg">
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
+            <br />
+            <t t-if="display['show_delete']">
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
+            </t>
+            <t t-if="display['show_hide']">
+                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
+            </t>
         </p>
     </t>
 

From 6e198938c71f9f1f325991317f81da1530a9fea0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 21:59:44 +0200
Subject: [PATCH 45/90] hr_recruitment nice applicant view

bzr revid: al@openerp.com-20120410195944-76vdzrrgvf3ihzxu
---
 addons/hr_recruitment/hr_recruitment_view.xml | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 9b48c3057cc..1f7d916c6f3 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -85,29 +85,30 @@
                 </div>
             </div>
             <sheet string="Jobs - Recruitment Form" layout="auto">
-                <group colspan="4" col="8">
-                        <field name="name" string="Subject"/>
+                <group colspan="4" col="4">
+                    <field name="name" string="Subject"/>
+                    <group colspan="2" col="4">
                         <field name="partner_name"/>
-                        <field name="job_id" on_change="onchange_job(job_id)"/>
                         <button name="action_makeMeeting" type="object" string="Meeting" icon="gtk-index"/>
-                        <button string="Send New Email"
-                            name="%(mail.action_email_compose_message_wizard)d"
-                            icon="terp-mail-message-new" type="action"/>
-                    <newline/>
+                        <button string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
+                    </group>
+                    <field name="user_id"/>
+                    <field name="job_id" on_change="onchange_job(job_id)"/>
                     <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
                     <group colspan="2" col="4">
                         <field name="stage_id" domain="['|',('department_id','=',department_id),('department_id','=',False)]"/>
                         <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
-                    <field name="user_id"/>
-                    <field name="survey" invisible="1"/>
-                    <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
-                    <field name="response" invisible="1"/>
-                    <newline/>
                     <field name="date_action"/>
-                    <field name="title_action"/>
+                    <group colspan="2" col="8">
+                        <field name="title_action"/>
+                        <field name="survey" invisible="1"/>
+                        <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
+                        <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                        <field name="response" invisible="1"/>
+                    </group>
+                    <newline/>
                 </group>
                 <notebook colspan="4">
                     <page string="Job Info">

From eca7e495d6bdbb5acd99751d9f50bce2d4d90095 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 22:30:29 +0200
Subject: [PATCH 46/90] mail restore object link

bzr revid: al@openerp.com-20120410203029-hc32debigx6paxc9
---
 addons/mail/static/src/xml/mail.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d97f0738629..c3cd218c8b3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -69,6 +69,7 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
+            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             <t t-if="params.thread_level > 0">
                 <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>

From c8c4e6252ad50a42ebb41aeb6ff9a5310eb91be8 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 11 Apr 2012 00:10:13 +0200
Subject: [PATCH 47/90] res_partner fix kanabn

bzr revid: al@openerp.com-20120410221013-k98x87b58pzd8tc0
---
 openerp/addons/base/res/res_partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index f2861b7786f..b0ab232aeba 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -513,7 +513,7 @@
                                     <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" width="64" height="64" class="oe_module_icon"/>
                                 </a>
                                     <div class="oe_module_desc">
-                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                        <div class="oe_kanban_box_content oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
                                             <table class="oe_kanban_table">
                                                 <tr>
                                                     <td class="oe_kanban_title1" align="left" valign="middle">
@@ -521,7 +521,7 @@
                                                             <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
                                                         </h4>
                                                             <i><div t-if="record.contact_address.raw_value"><field name="contact_address"/><br/></div>
-															<div t-if="record.email.raw_value">
+                                                            <div t-if="record.email.raw_value">
                                                             <field name="email"/><br/></div>
                                                             <div t-if="record.mobile.raw_value">
                                                             <field name="mobile"/><br/>

From b01cbdfd56a3c846393e437b5c98b044e679c53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Apr 2012 00:18:29 +0200
Subject: [PATCH 48/90] [FIX] Fixed last commit; mail widget already shows the
 link to document in first message of threads on the wall.

bzr revid: tde@openerp.com-20120410221829-gv9zqztps05xt8pg
---
 addons/mail/static/src/xml/mail.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c3cd218c8b3..d97f0738629 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -69,7 +69,6 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             <t t-if="params.thread_level > 0">
                 <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>

From 8d985d9cf0050586cee26567d5d88fa4368f44fb Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 11 Apr 2012 17:53:15 +0530
Subject: [PATCH 49/90] [im]Corrected url issue

bzr revid: dhr@tinyerp.com-20120411122315-idrxfs4wkd0ejuli
---
 addons/web/static/src/js/view_form.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 9abf8fdfbf9..55653151fad 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1577,7 +1577,11 @@ openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
         if (!this.value) {
             this.do_warn("Resource error", "This resource is empty");
         } else {
-            window.open(this.value);
+            var url = $.trim(this.value);
+            if(url.toLowerCase().search("http://") != -1)
+                window.open(url);
+            else
+                window.open('http://'+url);
         }
     }
 });

From 8e316cbdabd3e7e9decce57f02bcc94c1da7ba1c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 16 Apr 2012 13:49:53 +0200
Subject: [PATCH 50/90] [IMP] Improved styling for view manager header

bzr revid: fme@openerp.com-20120416114953-belugivw6fzfhrcz
---
 addons/web/static/src/css/base.css  | 6 ++++++
 addons/web/static/src/css/base.sass | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5288ce13a17..fc384fd9fbf 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -904,6 +904,9 @@
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
+.openerp .oe_view_manager_header2 .oe_view_manager_buttons {
+  white-space: nowrap;
+}
 .openerp .oe_view_manager_body h4 {
   margin: 8px 0;
 }
@@ -1042,6 +1045,9 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
+.openerp .oe_sidebar {
+  white-space: nowrap;
+}
 .openerp .oe_searchview {
   position: relative;
   float: right;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6afddbee2fa..b2373c7782b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -705,6 +705,8 @@ $colour4: #8a89ba
                 a
                     color: #fff
                     text-shadow: 0 1px 2px rgba(0,0,0,0.4)
+        .oe_view_manager_buttons
+            white-space: nowrap
     // }}}
     // ViewManager.body {{{
     .oe_view_manager_body
@@ -814,7 +816,8 @@ $colour4: #8a89ba
                     text-decoration: none
                     @include vertical-gradient(#f0f0fa, #eeeef6)
                     @include box-shadow(none)
-
+    .oe_sidebar
+        white-space: nowrap
     // }}}
     // SearchView xmo {{{
     .oe_searchview

From 3e701407b728b80516412f1a3e11f1d473fa64d7 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 16 Apr 2012 18:07:56 +0530
Subject: [PATCH 51/90] [IMP]code improved to support all protocols

bzr revid: dhr@tinyerp.com-20120416123756-ybx974od7ssdjrpq
---
 addons/web/static/src/js/view_form.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 55653151fad..92441cdcb69 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1577,11 +1577,11 @@ openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
         if (!this.value) {
             this.do_warn("Resource error", "This resource is empty");
         } else {
-            var url = $.trim(this.value);
-            if(url.toLowerCase().search("http://") != -1)
-                window.open(url);
-            else
+        	var url = $.trim(this.value);
+            if(/^[www]./i.test(url))
                 window.open('http://'+url);
+            else
+            	window.open(this.value);
         }
     }
 });

From 11c0136907b0b5bd96fd4e53e481c5542f0be7f4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 16 Apr 2012 16:45:42 +0200
Subject: [PATCH 52/90] [ADD] Add support for QWeb templates in form view

bzr revid: fme@openerp.com-20120416144542-modz8goodot8yr7b
---
 addons/web/static/src/js/view_form.js | 67 +++++++++++++++++++++++++--
 addons/web/static/src/js/views.js     | 20 ++++++++
 2 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e5824d64f59..27905ee4e73 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -55,6 +55,7 @@ openerp.web.FormView = openerp.web.View.extend({
         this.reload_mutex = new $.Mutex();
         this.mode = null;
         this.rendering_engine = new openerp.web.form.FormRenderingEngineReadonly(this);
+        this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
     },
     destroy: function() {
         _.each(this.get_widgets(), function(w) {
@@ -73,11 +74,13 @@ openerp.web.FormView = openerp.web.View.extend({
         this.fields_order = [];
         this.fields_view = data;
 
-        this.rendering_engine.set_fields_view(data);
         this.rendering_engine.set_fields_registry(this.fields_registry);
         this.rendering_engine.set_tags_registry(this.tags_registry);
-        var $dest = this.$element.hasClass("oe_form_container") ? this.$element : this.$element.find('.oe_form_container');
-        this.rendering_engine.render_to($dest);
+        if (!this.extract_qweb_template(data)) {
+            this.rendering_engine.set_fields_view(data);
+            var $dest = this.$element.hasClass("oe_form_container") ? this.$element : this.$element.find('.oe_form_container');
+            this.rendering_engine.render_to($dest);
+        }
 
         this.$sidebar = this.options.$sidebar || this.$element.find('.oe_form_sidebar');
 
@@ -124,6 +127,56 @@ openerp.web.FormView = openerp.web.View.extend({
         this.has_been_loaded.resolve();
         return $.when();
     },
+    extract_qweb_template: function(fvg) {
+        for (var i=0, ii=fvg.arch.children.length; i < ii; i++) {
+            var child = fvg.arch.children[i];
+            if (child.tag === "templates") {
+                this.qweb = new QWeb2.Engine();
+                this.qweb.add_template(openerp.web.json_node_to_xml(child));
+                if (!this.qweb.has_template('form')) {
+                    throw new Error("No QWeb template found for form view");
+                }
+                return true;
+            }
+        }
+        this.qweb = null;
+        return false;
+    },
+    get_fvg_from_qweb: function(record) {
+        var view = this.qweb.render('form', this.get_qweb_context(record));
+        var fvg = _.clone(this.fields_view);
+        fvg.arch = openerp.web.xml_to_json(openerp.web.str_to_xml(view).firstChild);
+        return fvg;
+    },
+    get_qweb_context: function(record) {
+        var self = this,
+            new_record = {};
+        _.each(record, function(value, name) {
+            var r = _.clone(self.fields_view.fields[name] || {});
+            if ((r.type === 'date' || r.type === 'datetime') && value) {
+                r.raw_value = openerp.web.auto_str_to_date(value);
+            } else {
+                r.raw_value = value;
+            }
+            r.value = openerp.web.format_value(value, r);
+            new_record[name] = r;
+        });
+        return {
+            record : new_record,
+            new_record : !record.id
+        };
+    },
+    kill_current_form: function() {
+        _.each(this.getChildren(), function(el) {
+            el.destroy();
+        });
+        this.fields = {};
+        this.fields_order = [];
+        this.default_focus_field = null;
+        this.default_focus_button = null;
+        this.translatable_fields = [];
+        this.$element.find('.oe_form_container').empty();
+    },
     do_load_state: function(state, warm) {
         if (state.id && this.datarecord.id != state.id) {
             if (!this.dataset.get_id_index(state.id)) {
@@ -185,6 +238,13 @@ openerp.web.FormView = openerp.web.View.extend({
         }
         this.datarecord = record;
 
+        if (this.qweb) {
+            this.kill_current_form();
+            this.rendering_engine.set_fields_view(this.get_fvg_from_qweb(record));
+            var $dest = this.$element.hasClass("oe_form_container") ? this.$element : this.$element.find('.oe_form_container');
+            this.rendering_engine.render_to($dest);
+        }
+
         _(this.fields).each(function (field, f) {
             field.reset();
             var result = field.set_value(self.datarecord[f] || false);
@@ -863,6 +923,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
             var w = new (obj)(self.view, openerp.web.xml_to_json($elem[0]));
             w.replace($elem);
         })
+        // TODO: return a deferred
     },
     render_element: function(template, layout/* dictionaries */) {
         var dicts = [].slice.call(arguments).slice(2);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index de9ff55758c..78f365c1a16 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1247,6 +1247,26 @@ session.web.xml_to_str = function(node) {
         return (new XMLSerializer()).serializeToString(node);
     }
 }
+session.web.str_to_xml = function(s) {
+    if (window.DOMParser) {
+        var dp = new DOMParser();
+        var r = dp.parseFromString(s, "text/xml");
+        if (r.body && r.body.firstChild && r.body.firstChild.nodeName == 'parsererror') {
+            throw new Error("Could not parse string to xml");
+        }
+        return r;
+    }
+    var xDoc;
+    try {
+        xDoc = new ActiveXObject("MSXML2.DOMDocument");
+    } catch (e) {
+        throw new Error("Could not find a DOM Parser: " + e.message);
+    }
+    xDoc.async = false;
+    xDoc.preserveWhiteSpace = true;
+    xDoc.loadXML(s);
+    return xDoc;
+}
 
 /**
  * Registry for all the client actions key: tag value: widget

From de101478138785f0ac9ac9740dc07aaa0eaed194 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 17:08:39 +0200
Subject: [PATCH 53/90] [imp] small refactoring in form view

bzr revid: nicolas.vanhoren@openerp.com-20120416150839-vr45ozrqffc72qmk
---
 addons/web/static/src/js/view_form.js          | 9 ++++++---
 addons/web/static/src/js/view_list_editable.js | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e5824d64f59..6863d49f1d1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -791,7 +791,11 @@ openerp.web.FormView = openerp.web.View.extend({
         });
         d.template = 'FormView.set_default';
         d.open();
-    }
+    },
+    register_field: function(field, name) {
+        this.fields[name] = field;
+        this.fields_order.push(name);
+    },
 });
 
 /**
@@ -855,6 +859,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
                 w.set_input_id($label.attr("for"));
             }
             self.alter_field(w);
+            self.view.register_field(w, $elem.attr("name"));
             w.replace($elem);
         });
         _.each(this.tags_to_init, function($elem) {
@@ -1621,8 +1626,6 @@ openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends opene
         this._super(field_manager, node);
         this.name = this.node.attrs.name;
         this.value = false;
-        this.view.fields[this.name] = this;
-        this.view.fields_order.push(this.name);
         this.field = this.view.fields_view.fields[this.name] || {};
         this.set({required: this.modifiers['required'] === true});
         this.invalid = this.dirty = false;
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index aea7f6837c1..4047fcd6500 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -413,6 +413,7 @@ openerp.web.list_editable = function (openerp) {
                 }
                 var obj = self.view.fields_registry.get_object(key);
                 var w = new (obj)(self.view, openerp.web.xml_to_json(el));
+                self.view.register_field(w, $elem.attr("name"));
                 w.appendTo($td);
                 $td.appendTo($element);
             });

From f03e76c40972bd29ce0b5cc969b683328382bd79 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 18:09:21 +0200
Subject: [PATCH 54/90] [fix] small problem in editable lists

bzr revid: nicolas.vanhoren@openerp.com-20120416160921-yzvyomy5jco0dsgm
---
 addons/web/static/src/js/view_list_editable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 4047fcd6500..41f8c012731 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -413,7 +413,7 @@ openerp.web.list_editable = function (openerp) {
                 }
                 var obj = self.view.fields_registry.get_object(key);
                 var w = new (obj)(self.view, openerp.web.xml_to_json(el));
-                self.view.register_field(w, $elem.attr("name"));
+                self.view.register_field(w, $(el).attr("name"));
                 w.appendTo($td);
                 $td.appendTo($element);
             });

From 81148c0b09b9e35a4dffbf83a63b70427cccff0c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 18:20:49 +0200
Subject: [PATCH 55/90] [imp] extracted fetch to make it less generic

bzr revid: nicolas.vanhoren@openerp.com-20120416162049-9mjgz6ul0zq1lzag
---
 addons/point_of_sale/static/src/js/pos.js | 39 +++++++++++++++--------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 148fe1ae74d..d99ffbafcee 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -58,6 +58,13 @@ openerp.point_of_sale = function(db) {
             localStorage['oe_pos_' + key] = JSON.stringify(value);
         },
     });
+    
+    var fetch = function(osvModel, fields, domain) {
+        var dataSetSearch;
+        dataSetSearch = new db.web.DataSetSearch(null, osvModel, {}, domain);
+        return dataSetSearch.read_slice(fields, 0);
+    };
+    
     /*
      Gets all the necessary data from the OpenERP web client (session, shop data etc.)
      */
@@ -84,22 +91,26 @@ openerp.point_of_sale = function(db) {
                     this.store.set(attr, val);
                 }, this));
             }, this));
-            $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']),
-                this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'product_image_small'], [['pos_categ_id', '!=', 'false']]),
-                this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
-                    [['state', '=', 'open'], ['user_id', '=', this.session.uid]]),
-                this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']),
-                this.fetch('account.tax', ['amount', 'price_include', 'type']),
-                this.get_app_data())
-                .pipe(_.bind(this.build_tree, this));
-        },
-        fetch: function(osvModel, fields, domain) {
-            var dataSetSearch;
             var self = this;
-            dataSetSearch = new db.web.DataSetSearch(this, osvModel, {}, domain);
-            return dataSetSearch.read_slice(fields, 0).then(function(result) {
-                return self.store.set(osvModel, result);
+            var cat_def = fetch('pos.category', ['name', 'parent_id', 'child_id']).pipe(function(result) {
+                return self.store.set('pos.category', result);
             });
+            var prod_def = fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id',
+                                                          'product_image_small'], [['pos_categ_id', '!=', 'false']]).then(function(result) {
+                return self.store.set('product.product', result);
+            });
+            var bank_def = fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
+                    [['state', '=', 'open'], ['user_id', '=', this.session.uid]]).then(function(result) {
+                return self.store.set('account.bank.statement', result);
+            });
+            var journal_def = fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']).then(function(result) {
+                return self.store.set('account.journal', result);
+            });
+            var tax_def = fetch('account.tax', ['amount', 'price_include', 'type']).then(function(result) {
+                return self.store.set('account.tax', result);
+            });
+            $.when(cat_def, prod_def, bank_def, journal_def, tax_def, this.get_app_data())
+                .pipe(_.bind(this.build_tree, this));
         },
         get_app_data: function() {
             var self = this;

From 5f69244e7542329c4bce0fc99ea1e46612a150d9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 18:56:30 +0200
Subject: [PATCH 56/90] wip

bzr revid: nicolas.vanhoren@openerp.com-20120416165630-sk808rmb31ztjqsf
---
 addons/point_of_sale/static/src/js/pos.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index d99ffbafcee..953ef32ca44 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -59,6 +59,13 @@ openerp.point_of_sale = function(db) {
         },
     });
     
+    var DAOInterface = {
+        
+    };
+    var LocalStorageDAO = db.web.Class.extend({
+        
+    });
+    
     var fetch = function(osvModel, fields, domain) {
         var dataSetSearch;
         dataSetSearch = new db.web.DataSetSearch(null, osvModel, {}, domain);
@@ -76,21 +83,12 @@ openerp.point_of_sale = function(db) {
             this.flush_mutex = new $.Mutex();
             this.build_tree = _.bind(this.build_tree, this);
             this.session = session;
-            var attributes = {
-                'pending_operations': [],
+            this.set({'pending_operations': [],
                 'currency': {symbol: '$', position: 'after'},
                 'shop': {},
                 'company': {},
-                'user': {},
-            };
-            _.each(attributes, _.bind(function(def, attr) {
-                var to_set = {};
-                to_set[attr] = this.store.get(attr, def);
-                this.set(to_set);
-                this.bind('change:' + attr, _.bind(function(unused, val) {
-                    this.store.set(attr, val);
-                }, this));
-            }, this));
+                'user': {}});
+            
             var self = this;
             var cat_def = fetch('pos.category', ['name', 'parent_id', 'child_id']).pipe(function(result) {
                 return self.store.set('pos.category', result);

From 88eeba08645306dba40d14b1444d470d4a21ba3a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 19:04:07 +0200
Subject: [PATCH 57/90] [imp] removed all references to model names

bzr revid: nicolas.vanhoren@openerp.com-20120416170407-l1jv5i6j06rh6dus
---
 addons/point_of_sale/static/src/js/pos.js | 29 ++++++++++-------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 953ef32ca44..1c60b69b59c 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -91,23 +91,20 @@ openerp.point_of_sale = function(db) {
             
             var self = this;
             var cat_def = fetch('pos.category', ['name', 'parent_id', 'child_id']).pipe(function(result) {
-                return self.store.set('pos.category', result);
+                return self.set({'categories': result});
             });
             var prod_def = fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id',
                                                           'product_image_small'], [['pos_categ_id', '!=', 'false']]).then(function(result) {
-                return self.store.set('product.product', result);
+                return self.set({'products': result});
             });
             var bank_def = fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
                     [['state', '=', 'open'], ['user_id', '=', this.session.uid]]).then(function(result) {
-                return self.store.set('account.bank.statement', result);
-            });
-            var journal_def = fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']).then(function(result) {
-                return self.store.set('account.journal', result);
+                return self.set({'bank_statements': result});
             });
             var tax_def = fetch('account.tax', ['amount', 'price_include', 'type']).then(function(result) {
-                return self.store.set('account.tax', result);
+                return self.set({'taxes': result});
             });
-            $.when(cat_def, prod_def, bank_def, journal_def, tax_def, this.get_app_data())
+            $.when(cat_def, prod_def, bank_def, tax_def, this.get_app_data())
                 .pipe(_.bind(this.build_tree, this));
         },
         get_app_data: function() {
@@ -159,7 +156,7 @@ openerp.point_of_sale = function(db) {
         categories: {},
         build_tree: function() {
             var c, id, _i, _len, _ref, _ref2;
-            _ref = this.store.get('pos.category');
+            _ref = this.get('categories');
             for (_i = 0, _len = _ref.length; _i < _len; _i++) {
                 c = _ref[_i];
                 this.categories[c.id] = {
@@ -182,7 +179,7 @@ openerp.point_of_sale = function(db) {
                 ancestors: [],
                 children: (function() {
                     var _j, _len2, _ref3, _results;
-                    _ref3 = this.store.get('pos.category');
+                    _ref3 = this.get('categories');
                     _results = [];
                     for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
                         c = _ref3[_j];
@@ -194,7 +191,7 @@ openerp.point_of_sale = function(db) {
                 }).call(this),
                 subtree: (function() {
                     var _j, _len2, _ref3, _results;
-                    _ref3 = this.store.get('pos.category');
+                    _ref3 = this.get('categories');
                     _results = [];
                     for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
                         c = _ref3[_j];
@@ -322,10 +319,10 @@ openerp.point_of_sale = function(db) {
             var totalTax = base;
             var totalNoTax = base;
             
-            var products = pos.store.get('product.product');
+            var products = pos.get('products');
             var product = _.detect(products, function(el) {return el.id === self.get('id');});
             var taxes_ids = product.taxes_id;
-            var taxes =  pos.store.get('account.tax');
+            var taxes =  pos.get('taxes');
             var taxtotal = 0;
             _.each(taxes_ids, function(el) {
                 var tax = _.detect(taxes, function(t) {return t.id === el;});
@@ -539,7 +536,7 @@ openerp.point_of_sale = function(db) {
                 products: new ProductCollection()
             });
             this.set({
-                cashRegisters: new CashRegisterCollection(pos.store.get('account.bank.statement')),
+                cashRegisters: new CashRegisterCollection(pos.get('bank_statements')),
             });
             return (this.get('orders')).bind('remove', _.bind( function(removedOrder) {
                 if ((this.get('orders')).isEmpty()) {
@@ -1262,7 +1259,7 @@ openerp.point_of_sale = function(db) {
             this.categoryView.children = c.children;
             this.categoryView.renderElement();
             this.categoryView.start();
-            products = pos.store.get('product.product').filter( function(p) {
+            products = pos.get('products').filter( function(p) {
                 var _ref;
                 return _ref = p.pos_categ_id[0], _.indexOf(c.subtree, _ref) >= 0;
             });
@@ -1336,7 +1333,7 @@ openerp.point_of_sale = function(db) {
                 pos.app = new App(self.$element);
                 db.webclient.set_content_full_screen(true);
                 
-                if (pos.store.get('account.bank.statement').length === 0)
+                if (pos.get('bank_statements').length === 0)
                     return new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_open_statement']], ['res_id']).pipe(
                             _.bind(function(res) {
                         return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {

From 2b2a203a04092dcce53c677b734c712c421af1d6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 19:07:21 +0200
Subject: [PATCH 58/90] [imp] completely removed store class

bzr revid: nicolas.vanhoren@openerp.com-20120416170721-swgsf8pyeg7y8uf8
---
 addons/point_of_sale/static/src/js/pos.js | 26 +----------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 1c60b69b59c..4e1747878d6 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -34,30 +34,6 @@ openerp.point_of_sale = function(db) {
         };
     };
     var _t = db.web._t;
-
-    /*
-     Local store access. Read once from localStorage upon construction and persist on every change.
-     There should only be one store active at any given time to ensure data consistency.
-     */
-    var Store = db.web.Class.extend({
-        init: function() {
-            this.data = {};
-        },
-        get: function(key, _default) {
-            if (this.data[key] === undefined) {
-                var stored = localStorage['oe_pos_' + key];
-                if (stored)
-                    this.data[key] = JSON.parse(stored);
-                else
-                    return _default;
-            }
-            return this.data[key];
-        },
-        set: function(key, value) {
-            this.data[key] = value;
-            localStorage['oe_pos_' + key] = JSON.stringify(value);
-        },
-    });
     
     var DAOInterface = {
         
@@ -78,7 +54,7 @@ openerp.point_of_sale = function(db) {
     var Pos = Backbone.Model.extend({
         initialize: function(session, attributes) {
             Backbone.Model.prototype.initialize.call(this, attributes);
-            this.store = new Store();
+            this.dao = new LocalStorageDAO();
             this.ready = $.Deferred();
             this.flush_mutex = new $.Mutex();
             this.build_tree = _.bind(this.build_tree, this);

From 43358fe2499ae5dba9dbd61a483ed51963da8b82 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 19:10:42 +0200
Subject: [PATCH 59/90] [imp] renammed products to product_list for lisibility

bzr revid: nicolas.vanhoren@openerp.com-20120416171042-304swvgac38mrmkm
---
 addons/point_of_sale/static/src/js/pos.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 4e1747878d6..d1873b1bdde 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -71,7 +71,7 @@ openerp.point_of_sale = function(db) {
             });
             var prod_def = fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id',
                                                           'product_image_small'], [['pos_categ_id', '!=', 'false']]).then(function(result) {
-                return self.set({'products': result});
+                return self.set({'product_list': result});
             });
             var bank_def = fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
                     [['state', '=', 'open'], ['user_id', '=', this.session.uid]]).then(function(result) {
@@ -295,8 +295,8 @@ openerp.point_of_sale = function(db) {
             var totalTax = base;
             var totalNoTax = base;
             
-            var products = pos.get('products');
-            var product = _.detect(products, function(el) {return el.id === self.get('id');});
+            var product_list = pos.get('product_list');
+            var product = _.detect(product_list, function(el) {return el.id === self.get('id');});
             var taxes_ids = product.taxes_id;
             var taxes =  pos.get('taxes');
             var taxtotal = 0;
@@ -1226,7 +1226,7 @@ openerp.point_of_sale = function(db) {
             this.category();
         };
         App.prototype.category = function(id) {
-            var c, products;
+            var c, product_list;
             if (id == null) {
                 id = 0;
             }
@@ -1235,28 +1235,28 @@ openerp.point_of_sale = function(db) {
             this.categoryView.children = c.children;
             this.categoryView.renderElement();
             this.categoryView.start();
-            products = pos.get('products').filter( function(p) {
+            product_list = pos.get('product_list').filter( function(p) {
                 var _ref;
                 return _ref = p.pos_categ_id[0], _.indexOf(c.subtree, _ref) >= 0;
             });
-            (this.shop.get('products')).reset(products);
+            (this.shop.get('products')).reset(product_list);
             var self = this;
             $('.searchbox input').keyup(function() {
                 var m, s;
                 s = $(this).val().toLowerCase();
                 if (s) {
-                    m = products.filter( function(p) {
+                    m = product_list.filter( function(p) {
                         return p.name.toLowerCase().indexOf(s) != -1;
                     });
                     $('.search-clear').fadeIn();
                 } else {
-                    m = products;
+                    m = product_list;
                     $('.search-clear').fadeOut();
                 }
                 return (self.shop.get('products')).reset(m);
             });
             return $('.search-clear').click( function() {
-                (self.shop.get('products')).reset(products);
+                (self.shop.get('products')).reset(product_list);
                 $('.searchbox input').val('').focus();
                 return $('.search-clear').fadeOut();
             });

From c9cd4657afdf77c5c2ced45dee8491a301702f2a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 03:19:33 +0200
Subject: [PATCH 60/90] [FIX] restore attachement, part1 read-only

bzr revid: al@openerp.com-20120417011933-wwkynkzpxex0lbbh
---
 addons/web/static/src/js/view_form.js | 63 ++----------------------
 addons/web/static/src/js/views.js     | 62 ++++++++++++++++++++----
 addons/web/static/src/xml/base.xml    | 70 +++++++++++++--------------
 3 files changed, 90 insertions(+), 105 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5b63ec3506d..a3f0d82bb63 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -112,7 +112,6 @@ openerp.web.FormView = openerp.web.View.extend({
         if (!this.sidebar && this.options.sidebar) {
             this.sidebar = new openerp.web.Sidebar(this);
             this.sidebar.appendTo(this.$sidebar);
-            //this.sidebar.attachments = new openerp.web.form.SidebarAttachments(this.sidebar, this);
             this.sidebar.add_toolbar(this.fields_view.toolbar);
             this.sidebar.add_items('other', [{
                 label: _t('Set Default'),
@@ -269,7 +268,7 @@ openerp.web.FormView = openerp.web.View.extend({
             self.is_initialized.resolve();
             self.do_update_pager(record.id == null);
             if (self.sidebar) {
-               // self.sidebar.attachments.do_update();
+               self.sidebar.do_attachement_update(self.dataset, self.datarecord.id);
             }
             if (self.default_focus_field) {
                 self.default_focus_field.focus();
@@ -697,12 +696,12 @@ openerp.web.FormView = openerp.web.View.extend({
                 this.dataset.alter_ids(this.dataset.ids.concat([this.datarecord.id]));
                 this.dataset.index = this.dataset.ids.length - 1;
             } else {
-            	this.dataset.alter_ids([this.datarecord.id].concat(this.dataset.ids));
+                this.dataset.alter_ids([this.datarecord.id].concat(this.dataset.ids));
                 this.dataset.index = 0;
             }
             this.do_update_pager();
             if (this.sidebar) {
-                // this.sidebar.attachments.do_update();
+                this.sidebar.do_attachement_update(this.dataset, this.datarecord.id);
             }
             //openerp.log("The record has been created with id #" + this.datarecord.id);
             this.reload();
@@ -1221,62 +1220,6 @@ openerp.web.form.FormDialog = openerp.web.Dialog.extend({
     }
 });
 
-
-openerp.web.form.SidebarAttachments = openerp.web.Widget.extend({
-    init: function(parent, form_view) {
-        //var $section = parent.add_section(_t('Attachments'), 'attachments');
-        //this.$div = $('<div class="oe-sidebar-attachments"></div>');
-        //$section.append(this.$div);
-        this._super(parent);
-        this.view = form_view;
-    },
-    do_update: function() {
-        return;
-        if (!this.view.datarecord.id) {
-            this.on_attachments_loaded([]);
-        } else {
-            (new openerp.web.DataSetSearch(
-                this, 'ir.attachment', this.view.dataset.get_context(),
-                [
-                    ['res_model', '=', this.view.dataset.model],
-                    ['res_id', '=', this.view.datarecord.id],
-                    ['type', 'in', ['binary', 'url']]
-                ])).read_slice(['name', 'url', 'type'], {}).then(this.on_attachments_loaded);
-        }
-    },
-    on_attachments_loaded: function(attachments) {
-        return;
-        this.attachments = attachments;
-        this.$div.html(QWeb.render('FormView.sidebar.attachments', this));
-        this.$element.find('.oe-binary-file').change(this.on_attachment_changed);
-        this.$element.find('.oe-sidebar-attachment-delete').click(this.on_attachment_delete);
-    },
-    on_attachment_changed: function(e) {
-        return;
-        window[this.element_id + '_iframe'] = this.do_update;
-        var $e = $(e.target);
-        if ($e.val() != '') {
-            this.$element.find('form.oe-binary-form').submit();
-            $e.parent().find('input[type=file]').prop('disabled', true);
-            $e.parent().find('button').prop('disabled', true).find('img, span').toggle();
-        }
-    },
-    on_attachment_delete: function(e) {
-        return;
-        var self = this, $e = $(e.currentTarget);
-        var name = _.str.trim($e.parent().find('a.oe-sidebar-attachments-link').text());
-        if (confirm(_.str.sprintf(_t("Do you really want to delete the attachment %s?"), name))) {
-            this.rpc('/web/dataset/unlink', {
-                model: 'ir.attachment',
-                ids: [parseInt($e.attr('data-id'))]
-            }, function(r) {
-                $e.parent().remove();
-                self.do_notify("Delete an attachment", "The attachment '" + name + "' has been deleted");
-            });
-        }
-    }
-});
-
 openerp.web.form.compute_domain = function(expr, fields) {
     var stack = [];
     for (var i = expr.length - 1; i >= 0; i--) {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 78f365c1a16..55e87c06904 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -727,8 +727,6 @@ session.web.Sidebar = session.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
         var view = this.getParent();
-        var view_manager = view.getParent();
-        var action = view_manager.action;
         this.sections = [
             { 'name' : 'print', 'label' : _t('Print'), },
             { 'name' : 'files', 'label' : _t('Attachement'), },
@@ -763,21 +761,22 @@ session.web.Sidebar = session.web.Widget.extend({
             var item = self.items[section][index];
             if (item.callback) {
                 item.callback.apply(self, [item]);
-            }
-            if (item.action) {
+            } else if (item.action) {
                 self.on_item_action_clicked(item);
+            } else if (item.url) {
+                return true;
             }
             return false;
         });
+        //this.$div.html(QWeb.render('FormView.sidebar.attachments', this));
+        //this.$element.find('.oe-binary-file').change(this.on_attachment_changed);
+        //this.$element.find('.oe-sidebar-attachment-delete').click(this.on_attachment_delete);
     },
     redraw: function() {
         var self = this;
         self.$element.html(QWeb.render('Sidebar', {widget: self}));
         this.$element.find('ul').hide();
     },
-    add_default_sections: function() {
-        var self = this;
-    },
     add_section: function() {
         var self = this;
     },
@@ -857,6 +856,52 @@ session.web.Sidebar = session.web.Widget.extend({
             });
         });
     },
+    do_attachement_update: function(dataset, model_id) {
+        if (!model_id) {
+            this.on_attachments_loaded([]);
+        } else {
+            var dom = [ ['res_model', '=', dataset.model], ['res_id', '=', model_id], ['type', 'in', ['binary', 'url']] ];
+            var ds = new session.web.DataSetSearch(this, 'ir.attachment', dataset.get_context(), dom);
+            ds.read_slice(['name', 'url', 'type'], {}).then(this.on_attachments_loaded);
+        }
+    },
+    on_attachments_loaded: function(attachments) {
+        var self = this;
+        var items = [];
+        // TODO: preprend: _s +
+        var prefix = '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=name&id=';
+        _.each(attachments,function(a) {
+            a.label = a.name;
+            if(a.type === "binary") {
+                a.url = prefix  + a.id + '&t=' + (new Date().getTime());
+            }
+        });
+        this.add_items('files', attachments);
+    },
+    on_attachment_changed: function(e) {
+        return;
+        window[this.element_id + '_iframe'] = this.do_update;
+        var $e = $(e.target);
+        if ($e.val() != '') {
+            this.$element.find('form.oe-binary-form').submit();
+            $e.parent().find('input[type=file]').prop('disabled', true);
+            $e.parent().find('button').prop('disabled', true).find('img, span').toggle();
+        }
+    },
+    on_attachment_delete: function(e) {
+        return;
+        var self = this, $e = $(e.currentTarget);
+        var name = _.str.trim($e.parent().find('a.oe-sidebar-attachments-link').text());
+        if (confirm(_.str.sprintf(_t("Do you really want to delete the attachment %s?"), name))) {
+            this.rpc('/web/dataset/unlink', {
+                model: 'ir.attachment',
+                ids: [parseInt($e.attr('data-id'))]
+            }, function(r) {
+                $e.parent().remove();
+                self.do_notify("Delete an attachment", "The attachment '" + name + "' has been deleted");
+            });
+        }
+    }
 });
 
 session.web.TranslateDialog = session.web.Dialog.extend({
@@ -1147,9 +1192,6 @@ session.web.View = session.web.Widget.extend({
     },
     do_search: function(view) {
     },
-    set_common_sidebar_sections: function(sidebar) {
-        sidebar.add_default_sections();
-    },
     on_sidebar_import: function() {
         var import_view = new session.web.DataImport(this, this.dataset);
         import_view.start();
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fdf5a5a7b5f..0df4ca71777 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -515,7 +515,7 @@
                 <button class="oe_dropdown_toggle"><t t-esc="section.label"/></button>
                 <ul class="oe_dropdown_menu">
                     <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
-                        <a class="oe_sidebar_action_a" t-att-title="item.title" href="#" t-att-data-section="section.name" t-att-data-index="item_index">
+                        <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
                             <t t-raw="item.label"/>
                         </a>
                     </li>
@@ -524,6 +524,40 @@
         </t>
     </div>
 </t>
+<t t-name="Sidebar.attachments">
+    <div class="oe-sidebar-attachments-toolbar">
+        <div class="oe-binary-file-set" style="float: right">
+            <form class="oe-binary-form" t-attf-target="#{element_id}_iframe"
+                method="post" enctype="multipart/form-data" action="/web/binary/upload_attachment">
+                <input type="hidden" name="session_id" t-att-value="session.session_id"/>
+                <input type="hidden" name="callback" t-attf-value="#{element_id}_iframe"/>
+                <input type="hidden" name="model" t-att-value="view.dataset.model"/>
+                <input type="hidden" name="id" t-att-value="view.datarecord.id"/>
+                <button class="oe_button" type="button">
+                    <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16" style="display: none"/>
+                    <span>Add</span>
+                </button>
+                <input type="file" class="oe-binary-file" name="ufile" title="Add attachment"
+                    t-att-onclick="view.datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
+            </form>
+            <iframe t-attf-id="#{element_id}_iframe" t-attf-name="#{element_id}_iframe" style="display: none"/>
+        </div>
+    </div>
+    <br style="clear: both"/>
+    <ul class="oe-sidebar-attachments-items">
+        <li t-foreach="attachments" t-as="attachment">
+            <t t-if="attachment.type == 'binary'" t-set="attachment.url" t-value="_s + '/web/binary/saveas?session_id='
+                + session.session_id + '&amp;model=ir.attachment&amp;id=' + attachment.id
+                + '&amp;field=datas&amp;filename_field=name&amp;t=' + (new Date().getTime())"/>
+            <a class="oe-sidebar-attachments-link" t-att-href="attachment.url" target="_blank">
+                <t t-esc="attachment.name"/>
+            </a>
+            <a href="#" class="oe-sidebar-attachment-delete" t-att-data-id="attachment.id" t-attf-title="Delete the attachment #{attachment.name}">
+                <img t-att-src='_s + "/web/static/src/img/attachments-close.png"' width="15" height="15" border="0"/>
+            </a>
+        </li>
+    </ul>
+</t>
 
 <t t-name="TreeView">
     <select t-if="toolbar" style="width: 30%">
@@ -690,40 +724,6 @@
         </t>
     </div>
 </t>
-<t t-name="FormView.sidebar.attachments">
-    <div class="oe-sidebar-attachments-toolbar">
-        <div class="oe-binary-file-set" style="float: right">
-            <form class="oe-binary-form" t-attf-target="#{element_id}_iframe"
-                method="post" enctype="multipart/form-data" action="/web/binary/upload_attachment">
-                <input type="hidden" name="session_id" t-att-value="session.session_id"/>
-                <input type="hidden" name="callback" t-attf-value="#{element_id}_iframe"/>
-                <input type="hidden" name="model" t-att-value="view.dataset.model"/>
-                <input type="hidden" name="id" t-att-value="view.datarecord.id"/>
-                <button class="oe_button" type="button">
-                    <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16" style="display: none"/>
-                    <span>Add</span>
-                </button>
-                <input type="file" class="oe-binary-file" name="ufile" title="Add attachment"
-                    t-att-onclick="view.datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
-            </form>
-            <iframe t-attf-id="#{element_id}_iframe" t-attf-name="#{element_id}_iframe" style="display: none"/>
-        </div>
-    </div>
-    <br style="clear: both"/>
-    <ul class="oe-sidebar-attachments-items">
-        <li t-foreach="attachments" t-as="attachment">
-            <t t-if="attachment.type == 'binary'" t-set="attachment.url" t-value="_s + '/web/binary/saveas?session_id='
-                + session.session_id + '&amp;model=ir.attachment&amp;id=' + attachment.id
-                + '&amp;field=datas&amp;filename_field=name&amp;t=' + (new Date().getTime())"/>
-            <a class="oe-sidebar-attachments-link" t-att-href="attachment.url" target="_blank">
-                <t t-esc="attachment.name"/>
-            </a>
-            <a href="#" class="oe-sidebar-attachment-delete" t-att-data-id="attachment.id" t-attf-title="Delete the attachment #{attachment.name}">
-                <img t-att-src='_s + "/web/static/src/img/attachments-close.png"' width="15" height="15" border="0"/>
-            </a>
-        </li>
-    </ul>
-</t>
 <form t-name="FormView.set_default" class="oe_forms oe_frame">
     <t t-set="args" t-value="widget.dialog_options.args"/>
     <table style="width: 100%">

From 2a54e468a9d8d6a763f062cd7ad813f1a942a056 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 03:29:20 +0200
Subject: [PATCH 61/90] [FIX] restore attachement, part2 still read-only

bzr revid: al@openerp.com-20120417012920-303yobg7y9c9fy1p
---
 addons/web/static/src/js/views.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 55e87c06904..50982373214 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -876,7 +876,8 @@ session.web.Sidebar = session.web.Widget.extend({
                 a.url = prefix  + a.id + '&t=' + (new Date().getTime());
             }
         });
-        this.add_items('files', attachments);
+        this.items['files'] = attachments;
+        this.redraw();
     },
     on_attachment_changed: function(e) {
         return;

From 4ecd07837f5f28d295efd5fe13b6643f863851fc Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 03:43:23 +0200
Subject: [PATCH 62/90] [FIX] restore attachement, part2 very beginning of add

bzr revid: al@openerp.com-20120417014323-vp1cn1k5en5ogmdq
---
 addons/web/static/src/js/views.js  | 9 ++++++---
 addons/web/static/src/xml/base.xml | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 50982373214..79d3d4cd167 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -757,7 +757,6 @@ session.web.Sidebar = session.web.Widget.extend({
             var section = $(this).data('section');
             var index = $(this).data('index');
             $(this).closest('ul').hide();
-            console.log('click item',section,index);
             var item = self.items[section][index];
             if (item.callback) {
                 item.callback.apply(self, [item]);
@@ -876,8 +875,12 @@ session.web.Sidebar = session.web.Widget.extend({
                 a.url = prefix  + a.id + '&t=' + (new Date().getTime());
             }
         });
-        this.items['files'] = attachments;
-        this.redraw();
+        attachments.push( { label: _t("Add..."), callback: self.on_attachment_add } );
+        self.items['files'] = attachments;
+        self.redraw();
+    },
+    on_attachment_add: function(e) {
+        this.$element.find('.oe_sidebar_add').show();
     },
     on_attachment_changed: function(e) {
         return;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 0df4ca71777..7cbffe865e5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -519,6 +519,9 @@
                             <t t-raw="item.label"/>
                         </a>
                     </li>
+                    <li t-if="section.name == 'files'" class="oe_sidebar_add" style="display:none;">
+                        Input type file stuff
+                    </li>
                 </ul>
             </div>
         </t>

From a87f82e393a6acccbbdaf867223f327329ea83e8 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 17 Apr 2012 04:51:24 +0000
Subject: [PATCH 63/90] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120407045522-76gwya51lihl0t2r
bzr revid: launchpad_translations_on_behalf_of_openerp-20120408043834-jrvm7d3sae8aki98
bzr revid: launchpad_translations_on_behalf_of_openerp-20120409045634-45612rg0m6hk96wl
bzr revid: launchpad_translations_on_behalf_of_openerp-20120417045124-4ci2fzmegcudnsfi
---
 openerp/addons/base/i18n/ja.po | 675 ++++++++++++++++++++++-----------
 1 file changed, 452 insertions(+), 223 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index a22b7512575..8f6da375214 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-04-06 04:31+0000\n"
+"PO-Revision-Date: 2012-04-16 18:23+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-06 04:37+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -204,7 +204,7 @@ msgstr "契約上の請求レート"
 #: code:addons/base/res/res_users.py:558
 #, python-format
 msgid "Warning!"
-msgstr "警告！"
+msgstr "警告"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:344
@@ -413,7 +413,7 @@ msgstr "子アプリケーション"
 #. module: base
 #: field:res.partner,credit_limit:0
 msgid "Credit Limit"
-msgstr "信用限度"
+msgstr "与信限度"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_graph
@@ -647,7 +647,7 @@ msgstr "コロンビア"
 #: code:addons/orm.py:1390
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr "選択した項目 '%s' の中にキー / バリュー '%s' がありません。"
+msgstr "キー / バリュー %s が選択した項目 %s の中にありません。"
 
 #. module: base
 #: help:res.country,code:0
@@ -1103,7 +1103,7 @@ msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
 "Define it through the Administration menu."
 msgstr ""
-"コード \"%s\" に対する言語がシステムに定義されていません。\n"
+"コード %s に対する言語がシステムに定義されていません。\n"
 "アドミニストレーションメニューを使ってそれを定義してください。"
 
 #. module: base
@@ -1155,7 +1155,7 @@ msgstr "遷移"
 #: code:addons/orm.py:4615
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "レコード#%d が見つかりません（%s ）。コピーはできません。"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -1191,9 +1191,9 @@ msgstr ""
 "　・ 休日管理\n"
 "　・ プロジェクト管理\n"
 "\n"
-"各部門の管理者は、チームの誰かが計画上妥当性を考慮中の未割り当ての時間があるか、タスクの割り当てを必要としている誰かがいるのかを知ることができます。\n"
+"各部門のマネジャは、チームの誰かが計画上妥当性を考慮中の未割り当ての時間があるか、タスクの割り当てを必要としている誰かがいるのかを知ることができます。\n"
 "\n"
-"月末に計画管理者は、割り当てられたタイムシートがそれぞれの分析会計を尊重した計画であるかをチェックすることもできます。\n"
+"月末に計画マネジャは、割り当てられたタイムシートがそれぞれの分析会計を尊重した計画であるかをチェックすることもできます。\n"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -1426,7 +1426,7 @@ msgstr ""
 #: code:addons/base/module/wizard/base_update_translations.py:38
 #, python-format
 msgid "No language with code \"%s\" exists"
-msgstr "コード \"%s\" を持つ言語が存在しません。"
+msgstr "コード %s を持つ言語が存在しません。"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document
@@ -1590,7 +1590,7 @@ msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
-"'%s' は余分なドットが含まれています。XMLのIDはドットを含んではいけません。 これらは module.reference_id "
+"%s には余分なドットが含まれています。XMLのIDはドットを含んではいけません。 これらは module.reference_id "
 "のように、他のモジュールデータに指し示すために使われます。"
 
 #. module: base
@@ -1893,16 +1893,15 @@ msgid ""
 "Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
 "\n"
-"This module allows your user to easily and efficiently participate in "
-"enterprise innovation.\n"
+"このモジュールはユーザが簡単に、そして効果的に企業改革に関与させます。\n"
 "============================================================================="
 "===============\n"
 "\n"
-"It allows everybody to express ideas about different subjects.\n"
-"Then, other users can comment on these ideas and vote for particular ideas.\n"
-"Each idea has a score based on the different votes.\n"
-"The managers can obtain an easy view of best ideas from all the users.\n"
-"Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+"それは全ての人が異なった題材についてアイディアを表現させます。\n"
+"それから、他のユーザはそれらのアイディアにコメントしたり、特定のアイディアに投票することができます。\n"
+"各アイディアは異なった投票に基づくスコアを持ちます。\n"
+"マネジャは全てのユーザから最良のアイディアの容易な視野を獲得できます。\n"
+"インストールした後、ツールのメインメニューの中にアイディアメニューがあることをチェックして下さい。"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -2068,7 +2067,7 @@ msgstr ""
 #: code:addons/base/res/res_users.py:420
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s（コピー）"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_chart
@@ -2288,24 +2287,24 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"この受注ジャーナルモジュールは受注と配達（選択リスト）を異なったジャーナルに分類することができます。\n"
+"この受注仕訳帳モジュールは受注と配達（選択リスト）を異なった仕訳帳に分類することができます。\n"
 "======================================================================\n"
 "このモジュールは部門を持つ大きな会社にとても役立ちます。\n"
 "\n"
-"以下のような異なる目的のためにジャーナルを使うことができます：\n"
+"以下のような異なる目的のために仕訳帳を使うことができます：\n"
 "    ・ 別部門の受注の分離\n"
 "    ・ 配達がトラックなのかUPSなのかの仕訳\n"
 "\n"
-"ジャーナルは責任を持ち、異なる状態に展開する：\n"
+"仕訳帳にはそうした責任があり、そして異なる状態に進展します：\n"
 "    ・ ドラフト、オープン、キャンセル、完了\n"
 "\n"
-"バッチ操作は一度に全ての受注の確認、検証、請求書集荷といった異なるジャーナルを処理できます。\n"
+"バッチ操作は一度に全ての受注の確認、検証、請求書集荷といった異なる仕訳帳を処理できます。\n"
 "\n"
 "バッチ請求方法はパートナごとや受注オーダーごとに構成することもできます。例：\n"
 "    ・ 日々の送付\n"
 "    ・ 月次の送付など\n"
 "\n"
-"いくらかのジャーナルによる統計値が提供されます。\n"
+"いくらかの仕訳帳による統計値が提供されます。\n"
 "    "
 
 #. module: base
@@ -2349,7 +2348,7 @@ msgstr ""
 "以下の全てのワークフローが実装されています：\n"
 "    ・ ドラフト経費\n"
 "    ・ 従業員によるシートの確認\n"
-"    ・ 管理者による認可\n"
+"    ・ マネジャによる認可\n"
 "    ・ 会計人による認可と請求書の作成\n"
 "    ・ 従業員へ請求書に基づく支払い\n"
 "\n"
@@ -2483,8 +2482,8 @@ msgstr ""
 "\n"
 "異なったジョブに向けての面接を認めるための調査モジュールと統合されています。\n"
 "\n"
-"このモジュールはメールケーとウェイと統合されていて、自動的にjobs@YOURCOMPANY.comに\n"
-"送られた電子メールを追跡します。あなたの履歴ベースに保存、検索できるドキュメント管理システム\n"
+"このモジュールはメールゲートウェイと統合されていて、自動的にjobs@YOURCOMPANY.comに\n"
+"送られたEメールを追跡します。あなたの履歴ベースに保存、検索できるドキュメント管理システム\n"
 "とも統合されています。\n"
 "    "
 
@@ -2508,13 +2507,13 @@ msgstr "ポーランド"
 msgid ""
 "Comma-separated list of allowed view modes, such as 'form', 'tree', "
 "'calendar', etc. (Default: tree,form)"
-msgstr "'form'、'tree'、'calendar'など（デフォルト：tree、form）のようなビューモードの許されたカンマ区切りのリスト"
+msgstr "'form'、'tree'、'calendar'など（デフォルト：tree、form）のような表示モードの許されたカンマ区切りのリスト"
 
 #. module: base
 #: code:addons/orm.py:3615
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
-msgstr "このドキュメントはあなたの前回参照時から更新されています（%s:%d）"
+msgstr "このドキュメントはあなたの前回参照時から更新されています（%s：%d）"
 
 #. module: base
 #: view:workflow:0
@@ -2778,7 +2777,7 @@ msgstr "サーバアクション"
 #. module: base
 #: help:ir.actions.client,params:0
 msgid "Arguments sent to the client along withthe view tag"
-msgstr "引数はクライアントにビュータグとともに送信されます。"
+msgstr "引数はクライアントにビューのタグとともに送信されます。"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_gtd
@@ -2859,7 +2858,7 @@ msgstr "発行人保証サーバとの通信途中のエラー"
 #: model:res.groups,name:base.group_sale_manager
 #: model:res.groups,name:base.group_tool_manager
 msgid "Manager"
-msgstr "管理者"
+msgstr "マネジャ"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -3119,7 +3118,7 @@ msgstr "ストレージのパラメータ"
 #: code:addons/base/module/module.py:409
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
-msgstr "モジュール '%s' はインストールされていないためアップグレードできません。"
+msgstr "モジュール %s はインストールされていないためアップグレードできません。"
 
 #. module: base
 #: model:res.country,name:base.cu
@@ -4037,7 +4036,7 @@ msgstr "会社名"
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
 "integer): \"%s\""
-msgstr "参照項目として無効な値です \"%s.%s\" （最後の部分は整数の０以外にすべきです）：\"%s\""
+msgstr "参照項目として無効な値です %s.%s（最後の部分は整数の０以外にすべきです）：%s"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_human_resources
@@ -4083,7 +4082,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    ・ 多言語サポート：勘定科目表、税金、税金コード、ジャーナル、会計テンプレート、分析勘定科目表、ジャーナル分析\n"
+"    ・ 多言語サポート：勘定科目表、税金、税金コード、仕訳帳、会計テンプレート、分析勘定科目表、仕訳帳分析\n"
 "    ・ セットアップウィザード変更\n"
 "        ・ テンプレートから目的のオブジェクトへCOA、税金、税金コード、会計ポジションの翻訳をコピー\n"
 "    "
@@ -4162,7 +4161,7 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
-"そのモジュールファイルの作成ができません：\n"
+"モジュールファイルの作成ができません：\n"
 " %s"
 
 #. module: base
@@ -4253,7 +4252,7 @@ msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
 "%s: %s"
 msgstr ""
-"SMTPサーバによるメール送信は失敗しました '%s'。\n"
+"SMTPサーバによるメール送信は失敗しました %s。\n"
 "%s: %s"
 
 #. module: base
@@ -4299,9 +4298,9 @@ msgstr ""
 "会計アクセス権限\n"
 "=========================\n"
 "\n"
-"このモジュールはアドミンユーザにジャーナル項目や勘定科目表といった全ての会計機能へのアクセスを与えます。\n"
+"このモジュールはアドミンユーザに仕訳項目や勘定科目表といった全ての会計機能へのアクセスを与えます。\n"
 "\n"
-"アドミニストレータには管理者とユーザアクセス権を、デモユーザにはユーザアクセス権のみを割り当てます。\n"
+"アドミニストレータにはマネジャとユーザアクセス権を、デモユーザにはユーザアクセス権のみを割り当てます。\n"
 "    "
 
 #. module: base
@@ -4439,7 +4438,7 @@ msgstr ""
 "\n"
 "  ・ 分析ライン（分析ラインと関連付けされた一般アカウントを持つ会社）の所有者に適合させる\n"
 "  ・ 分析ライン（金融の会計に類似している）に多通貨を追加する\n"
-"  ・ コストに分類される全てをオーナー会社の正しい通貨に基づいて分析アカウントの中に修正する\n"
+"  ・ コストに分類される全てを所有会社の正しい通貨に基づいて分析アカウントの中に修正する\n"
 "  ・ デフォルトでは、単独会社においては何ら変更なし\n"
 "\n"
 "結果として、同じ通貨ではない会社間において同じ分析アカウントを共有することができます。このセットアップは有効にします。どうぞお使い下さい。\n"
@@ -5388,7 +5387,7 @@ msgstr "セキュリティ"
 #: code:addons/base/ir/ir_model.py:311
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
-msgstr "システムに保存されている項目\"%s\"は変更が許されていません。"
+msgstr "システムに保存されている項目%s は変更が許されていません。"
 
 #. module: base
 #: help:res.partner.bank,company_id:0
@@ -5748,7 +5747,7 @@ msgstr ""
 "このモジュールをインストール後、会計の設定ウィザードが自動起動します。\n"
 "    ・ 勘定科目表作成を補助する会計テンプレートがあります。\n"
 "    ・ "
-"特定のウィザードでは会社の名前、従うべき表のテンプレート、生成するための桁数、あなたのアカウントと銀行口座、ジャーナル作成のための通貨が尋ねられます。\n"
+"特定のウィザードでは会社の名前、従うべき表のテンプレート、生成するための桁数、あなたのアカウントと銀行口座、仕訳帳作成のための通貨が尋ねられます。\n"
 "\n"
 "すると、未記入の表テンプレートのコピーが作成されます。\n"
 "\n"
@@ -6153,8 +6152,8 @@ msgstr ""
 "    ・ 外貨サポート\n"
 "    ・ 全てのデータレコードタイプ（0、1、2、3、4,、8、9）のサポート\n"
 "    ・ 全てのトランザクションコード、構造化された形式の通信の解析とロギング\n"
-"    ・ CODA構成パラメータを通した自動金融ジャーナル割り当て\n"
-"    ・ 銀行口座番号ごとの複数ジャーナルのサポート\n"
+"    ・ CODA構成パラメータを通した自動金融仕訳帳割り当て\n"
+"    ・ 銀行口座番号ごとの複数仕訳帳のサポート\n"
 "    ・ １つのCODAファイル中の異なった銀行口座の複数の口座明細をサポート\n"
 "    ・ CODA銀行口座の構文解析のみをサポート（CODA銀行口座設定でtype='info'と定義された）\n"
 "    ・ 多言語CODA解析、イギリス、オランダ、フランスのために与えられた解析設定データ\n"
@@ -6239,7 +6238,7 @@ msgid ""
 "        "
 msgstr ""
 "\n"
-"このモジュールによって一般的なジャーナルを使って、幾つかの分析計画を使うことができます。\n"
+"このモジュールによって一般的な仕訳帳を使って、幾つかの分析計画を使うことができます。\n"
 "============================================================================="
 "======\n"
 "\n"
@@ -6324,11 +6323,11 @@ msgid ""
 "user-wise as well as month wise.\n"
 msgstr ""
 "\n"
-"これはサービス会社のプロジェクト管理者に会計分析ビュー更新のために重要なデータを見せるためのモジュールです。\n"
+"これはサービス会社のプロジェクトマネジャに会計分析ビュー更新のために重要なデータを見せるためのモジュールです。\n"
 "============================================================================="
 "======================================\n"
 "\n"
-"各管理者に関連情報を見せるためにメニューに追加します。\n"
+"各マネジャに関連情報を見せるためにメニューに追加します。\n"
 "月単位と同じようにユーザ単位の会計分析要約のレポートを表示できます。\n"
 
 #. module: base
@@ -6495,7 +6494,7 @@ msgstr "グジャラート語 / ગુજરાતી"
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
-msgstr "外部依存が解決されないため、モジュール\"%s\"の処理ができません： %s"
+msgstr "外部依存が解決されないため、モジュール%s の処理ができません： %s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
@@ -6673,7 +6672,7 @@ msgstr "公式な翻訳のロード"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr "ジャーナル入力のキャンセル"
+msgstr "仕訳帳入力のキャンセル"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7102,7 +7101,7 @@ msgstr "時刻の書式"
 #: code:addons/orm.py:2134
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr "構造のために定義されたビューのタイプ’%s’がありません。"
+msgstr "構造のために定義されたビューのタイプ %s がありません。"
 
 #. module: base
 #: view:ir.module.module:0
@@ -7176,7 +7175,7 @@ msgstr "不在の繰り返し"
 #: code:addons/base/module/wizard/base_module_import.py:69
 #, python-format
 msgid "Can not create the module file: %s !"
-msgstr "このモジュールファイルの作成ができません: %s !"
+msgstr "このモジュールファイルの作成ができません: %s"
 
 #. module: base
 #: field:ir.server.object.lines,server_id:0
@@ -7390,7 +7389,7 @@ msgstr "シリアルキー"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 msgid "Timesheets"
-msgstr "タイムシート"
+msgstr "勤務表"
 
 #. module: base
 #: field:res.partner,function:0
@@ -7936,7 +7935,7 @@ msgstr "スペイン語（メキシコ）/ Español (MX)"
 #: code:addons/base/publisher_warranty/publisher_warranty.py:145
 #, python-format
 msgid "Please verify your publisher warranty serial number and validity."
-msgstr "発行者の保証シリアル番号とその有効性を確認して下さい。"
+msgstr "発行人保証シリアル番号とその有効性を確認して下さい。"
 
 #. module: base
 #: view:res.log:0
@@ -7966,7 +7965,7 @@ msgstr "このウィンドウ"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contracts"
-msgstr "発行者保証契約"
+msgstr "発行人保証契約"
 
 #. module: base
 #: help:res.log,name:0
@@ -8471,7 +8470,7 @@ msgstr ""
 "\n"
 "プッシュプローの仕様は、どの場所がどの場所と何のパラメータでつながれているかを示します。\n"
 "製品の所定の量が供給元の場所で動きがあるや否や、結び付けられた動作が、フロー定義\n"
-"（目的地の場所、遅延、移動の種類、ジャーナル他）でセットされたパラメータにしたがって\n"
+"（目的地の場所、遅延、移動の種類、仕訳帳他）でセットされたパラメータにしたがって\n"
 "自動的に予測されます。\n"
 "この新しい動きは、パラメータにしたがって自動的に実行されるか、手動確認を要求します。\n"
 "\n"
@@ -8838,7 +8837,7 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
-"あなたは次のモジュールに依存するモジュールをアップグレードしようとしています： %s.\n"
+"あなたは次のモジュールに依存するモジュールをアップグレードしようとしています： %s\n"
 "しかし、そのモジュールはあなたのシステムでは使用できません。"
 
 #. module: base
@@ -9036,8 +9035,8 @@ msgid ""
 "installed the CRM, with the history tab, you can track all the interactions "
 "with a partner such as opportunities, emails, or sales orders issued."
 msgstr ""
-"顧客（システムの他のエリアではパートナと呼ばれる）は、あなたが彼らが将来顧客であるのか、仕入先であるのかどうか会社の住所録の管理するのを手助けします。パー"
-"トナのフォームは、会社のアドレスから、価格リストなどの多くの情報、パートナの連絡先まで相互に必要なすべての情報を追跡し、記録することができます。\r\n"
+"顧客（システムの他のエリアではパートナと呼ばれる）は、彼らが見込み客、顧客であるのか、仕入先であるのかどうか会社の住所録の管理するのを手助けします。パート"
+"ナのフォームは、会社のアドレスから、価格リストなどの多くの情報、パートナの連絡先まで相互に必要なすべての情報を追跡し、記録することができます。\r\n"
 "CRMをインストールした場合は、履歴タブでパートナと共にオポチュニティ、電子メール、発行された受注など全ての対話を追跡することができます。"
 
 #. module: base
@@ -9065,7 +9064,7 @@ msgstr ""
 #. module: base
 #: view:res.request.history:0
 msgid "Request History"
-msgstr "要望履歴"
+msgstr "リクエストの履歴"
 
 #. module: base
 #: help:ir.rule,global:0
@@ -10928,7 +10927,7 @@ msgstr "アイスランド"
 #: model:ir.actions.act_window,name:base.ir_action_window
 #: model:ir.ui.menu,name:base.menu_ir_action_window
 msgid "Window Actions"
-msgstr "ウィンドウの操作"
+msgstr "ウィンドウアクション"
 
 #. module: base
 #: view:res.lang:0
@@ -11159,7 +11158,7 @@ msgstr "購読申し込み"
 #: help:ir.actions.server,model_id:0
 msgid ""
 "Select the object on which the action will work (read, write, create)."
-msgstr "アクションが動作する（読込、書込、作成）オブジェクトを選択して下さい。"
+msgstr "アクションが動作する（読み込み、書き込み、作成）オブジェクトを選択して下さい。"
 
 #. module: base
 #: field:base.language.import,name:0
@@ -11239,7 +11238,7 @@ msgstr "休暇管理"
 #: view:res.partner.address:0
 #: view:workflow.activity:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -11446,7 +11445,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"このモジュールは所定のアカウントで特定のジャーナルのデフォルト請求レートを定義することができます。\n"
+"このモジュールは所定のアカウントで特定の仕訳帳のデフォルト請求レートを定義することができます。\n"
 "============================================================================="
 "=================================\n"
 "\n"
@@ -11794,8 +11793,8 @@ msgstr ""
 "会計入力のキャンセルができます。\n"
 "=====================================\n"
 "\n"
-"このモジュールはアカウントジャーナルのフォームビューに\"入力のキャンセルを許可\"項目を追加します。Trueが設定されている場合は、ユーザは入力と請求書"
-"をキャンセルすることができます。\n"
+"このモジュールは会計仕訳帳のフォームビューに\"入力のキャンセルを許可\"項目を追加します。Trueが設定されている場合は、ユーザは入力と請求書をキャンセ"
+"ルすることができます。\n"
 "    "
 
 #. module: base
@@ -12085,7 +12084,7 @@ msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
 "But the latter module is not available in your system."
 msgstr ""
-"あなたはモジュール'%s'をインストールしようとしています。これはモジュール'%s'に依存しています。\n"
+"あなたはモジュール %s をインストールしようとしています。これはモジュール %s に依存しています。\n"
 "しかし、後者のモジュールはあなたのシステムでは利用可能ではありません。"
 
 #. module: base
@@ -12693,8 +12692,8 @@ msgid ""
 "Project, Project Tasks Data into OpenERP Module."
 msgstr ""
 "このモジュールはSugarCRMの以下のデータをOpenERPモジュールにインポートします：\n"
-"　　Leads、Opportunities、Users、Accounts、Contacts、Employees、Meetings、\n"
-"　　Phonecalls、Emails、Project、Project Tasks"
+"　　リード、オポチュニティ、ユーザ、会計、コンタクト、従業員、ミーティング、\n"
+"　　電話、Eメール、プロジェクト、プロジェクトタスク"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
@@ -12768,7 +12767,7 @@ msgstr "コメント"
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 msgid "HR Manager"
-msgstr "HR管理者"
+msgstr "HRマネジャ"
 
 #. module: base
 #: view:ir.filters:0
@@ -12879,7 +12878,7 @@ msgstr "OpenERPパートナ"
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
-msgstr "モジュール\"%s\" をインストールすることができません。なぜなら、外部依存関係が満たされていないからです：%s"
+msgstr "モジュール %s をインストールすることができません。なぜなら、外部依存関係が満たされていないからです：%s"
 
 #. module: base
 #: view:ir.module.module:0
@@ -13638,7 +13637,7 @@ msgstr ""
 "============================================================================="
 "============================\n"
 "\n"
-"　・ スプリントプロジェクト、プロダクトオーナー、スクラムマスター\n"
+"　・ スプリントプロジェクト、プロダクト所有者、スクラムマスター\n"
 "　・スプリントの レビュー、デイリーミーティング、フィードバック\n"
 "　・ 製品バックログ\n"
 "　・ スプリントバックログ\n"
@@ -13794,9 +13793,9 @@ msgstr ""
 "従業員の評価を作成する機能\n"
 "=======================================\n"
 "\n"
-"評価は彼の管理者と同様に部下や後輩のために従業員によって作成することができます。\n"
+"評価は彼のマネジャと同様に部下や後輩のために従業員によって作成することができます。\n"
 "その評価は様々な調査を作成され、そして従業員階層のどのレベルが何を満たすかを定義\n"
-"された計画の下で実行されます。そして最終レビューと評価は管理者によって実行されます。\n"
+"された計画の下で実行されます。そして最終レビューと評価はマネジャによって実行されます。\n"
 "全ての評価は従業員によってファイルされ、それはPDFファイルの形式で見ることができます。\n"
 "自身の現在の評価のためにダッシュボードを実装しています。\n"
 "         "
@@ -14042,7 +14041,7 @@ msgstr ""
 "を使っていないなら、パスワードはネットワーク上を暗号化されないで転送されますので、\n"
 "他のセキュリティ対策を無視して良いということではありません。\n"
 "また、データベースに格納された他を保護しません。それは重要なデータを含むかもしれません。\n"
-"全てのエリアに対して、システム管理者によって以下のような適切なセキュリティ対策の実装が要求されます。\n"
+"全てのエリアに対して、システムアドミニストレータによって以下のような適切なセキュリティ対策の実装が要求されます。\n"
 "データベースバックアップ、システムファイル、リモートシェルアクセス、物理サーバアクセスなどに対する保護\n"
 "\n"
 "LDAP認証との統合\n"
@@ -14704,7 +14703,7 @@ msgstr ""
 "OpenERPはLDAPのパスワード変更の管理をしません。そのため、パスワードの変更は\n"
 "LDAPディレクトリに直接的に（LDAPユーザ用）他の方法によって処理されるべきです。\n"
 "\n"
-"LDAP認証ユーザ（管理者アカウントは1つの明示的な例）とともに、データベースにローカルの\n"
+"LDAP認証ユーザ（アドミニストレータアカウントは1つの明示的な例）とともに、データベースにローカルの\n"
 "OpenERPユーザを持つことも可能です。\n"
 "\n"
 "それはどのように機能するか：\n"
@@ -15189,7 +15188,7 @@ msgstr "ブルガリア"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr "出版社保証契約は正常に登録されました。"
+msgstr "発行人保証契約は正常に登録されました。"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -15967,7 +15966,7 @@ msgstr "顧客パートナ"
 #. module: base
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "同一のログインに２つのユーザを持つことはできません！"
+msgstr "同じログインでは２つのユーザを持てません。"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_history
@@ -16213,7 +16212,7 @@ msgstr "ルクセンブルク"
 #. module: base
 #: selection:res.request,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低い"
 
 #. module: base
 #: code:addons/base/ir/ir_ui_menu.py:284
@@ -16226,12 +16225,12 @@ msgstr "エラーです。再帰的な関係となるメニューを作ること
 msgid ""
 "3. If user belongs to several groups, the results from step 2 are combined "
 "with logical OR operator"
-msgstr ""
+msgstr "3. ユーザが複数のグループに属している場合は、論理OR演算子により２つが組み合わされた結果となります。"
 
 #. module: base
 #: model:ir.module.module,description:base.module_auth_openid
 msgid "Allow users to login through OpenID."
-msgstr ""
+msgstr "ユーザはOpenIDを介してログインすることができます。"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_payment
@@ -16241,7 +16240,7 @@ msgstr "仕入先支払管理"
 #. module: base
 #: model:res.country,name:base.sv
 msgid "El Salvador"
-msgstr ""
+msgstr "エルサルバドル"
 
 #. module: base
 #: field:res.bank,phone:0
@@ -16249,17 +16248,17 @@ msgstr ""
 #: field:res.partner,phone:0
 #: field:res.partner.address,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "電話"
 
 #. module: base
 #: field:res.groups,menu_access:0
 msgid "Access Menu"
-msgstr ""
+msgstr "アドレスメニュー"
 
 #. module: base
 #: model:res.country,name:base.th
 msgid "Thailand"
-msgstr ""
+msgstr "タイ王国"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_report_creator
@@ -16274,18 +16273,26 @@ msgid ""
 "After installing the module, it adds a menu to define a custom report in\n"
 "the Administration / Customization / Reporting menu.\n"
 msgstr ""
+"\n"
+"このモジュールは幾つかのオブジェクトによりどんな統計レポートも作ることができます。\n"
+"=========================================================================\n"
+"\n"
+"これは、エンドユーザのためのSQLクエリビルダーとブラウザです。\n"
+"\n"
+"モジュールをインストールした後、アドミニストレーション / カスタム化 / レポーティング\n"
+"メニューの中にカスタムレポートを定義するためのメニューが追加されます。\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_designer
 msgid "Report Designer"
-msgstr ""
+msgstr "レポートデザイナ"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_address_book
 #: model:ir.ui.menu,name:base.menu_config_address_book
 #: model:ir.ui.menu,name:base.menu_procurement_management_supplier
 msgid "Address Book"
-msgstr ""
+msgstr "アドレス帳"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ma
@@ -16300,6 +16307,15 @@ msgid ""
 "cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
 "d'expertise comptable Seddik au cours du troisième trimestre 2010"
 msgstr ""
+"\n"
+"これはモロッコの会計表を管理するための基本モジュールです。\n"
+"=================================================================\n"
+"\n"
+"Ce Module charge le modèle du plan de comptes standard Marocain et permet de "
+"générer les états comptables aux normes marocaines (Bilan, CPC (comptes de "
+"produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
+"d'expertise comptable Seddik au cours du troisième trimestre 2010"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_calendar
@@ -16308,11 +16324,14 @@ msgid ""
 "        OpenERP Web calendar view.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Webカレンダービュー\n"
+"        "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr ""
+msgstr "リードとオポチュニティ"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -16322,40 +16341,40 @@ msgstr "ルーマニア語 / română"
 #. module: base
 #: view:res.log:0
 msgid "System Logs"
-msgstr ""
+msgstr "システムログ"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
 #: selection:workflow.activity,split_mode:0
 msgid "And"
-msgstr ""
+msgstr "かつ"
 
 #. module: base
 #: help:ir.values,res_id:0
 msgid ""
 "Database identifier of the record to which this applies. 0 = for all records"
-msgstr ""
+msgstr "これを適用するためのレコードのデータベース識別子。0 = 全てのレコードのため"
 
 #. module: base
 #: field:ir.model.fields,relation:0
 msgid "Object Relation"
-msgstr ""
+msgstr "オブジェクトの関係"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_voucher
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "電子請求と支払"
 
 #. module: base
 #: view:ir.rule:0
 #: view:res.partner:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: base
 #: model:res.country,name:base.uz
 msgid "Uzbekistan"
-msgstr ""
+msgstr "ウズベキスタン"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window
@@ -16366,33 +16385,33 @@ msgstr ""
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply For Create"
-msgstr ""
+msgstr "作成の適用"
 
 #. module: base
 #: model:res.country,name:base.vi
 msgid "Virgin Islands (USA)"
-msgstr ""
+msgstr "アメリカ領ヴァージン諸島"
 
 #. module: base
 #: model:res.country,name:base.tw
 msgid "Taiwan"
-msgstr ""
+msgstr "台湾"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
 msgid "Currency Rate"
-msgstr ""
+msgstr "為替レート"
 
 #. module: base
 #: field:workflow,osv:0
 #: field:workflow.instance,res_type:0
 msgid "Resource Object"
-msgstr ""
+msgstr "リソースオブジェクト"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_helpdesk
 msgid "Helpdesk"
-msgstr ""
+msgstr "ヘルプデスク"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.grant_menu_access
@@ -16403,16 +16422,19 @@ msgid ""
 "be assigned to specific groups in order to make them accessible to some "
 "users within the system."
 msgstr ""
+"OpenERPシステムメニューの中の利用可能で表示される項目の管理とカスタマイズができます。各行の先頭にあるボックスをクリックして現れたボタンを介して削除"
+"することで、その項目を削除することができます。項目は、システム内の一部のユーザーからアクセスできるようにするために、特定のグループに割り当てることができま"
+"す。"
 
 #. module: base
 #: field:ir.ui.view,field_parent:0
 msgid "Child Field"
-msgstr ""
+msgstr "子項目"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Detailed algorithm:"
-msgstr ""
+msgstr "アルゴリズムの詳細："
 
 #. module: base
 #: field:ir.actions.act_window,usage:0
@@ -16423,7 +16445,7 @@ msgstr ""
 #: field:ir.actions.server,usage:0
 #: field:ir.actions.wizard,usage:0
 msgid "Action Usage"
-msgstr ""
+msgstr "アクションの用途"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
@@ -16433,19 +16455,19 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_profile_tools
 msgid "Miscellaneous Tools"
-msgstr ""
+msgstr "その他のツール"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_tools
 msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
-msgstr ""
+msgstr "調査、昼食、アイディアボックスといった様々な興味深い、しかし、本質的ではないツールのインストールができます。"
 
 #. module: base
 #: selection:ir.module.module,state:0
 msgid "Not Installable"
-msgstr ""
+msgstr "インストール可能でない"
 
 #. module: base
 #: model:ir.module.module,description:base.module_product
@@ -16471,27 +16493,46 @@ msgid ""
 "Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"これはOpenERPの製品と価格リストを管理するための基本モジュールです。\n"
+"========================================================================\n"
+"\n"
+"製品は異形、異なる価格設定方法、仕入先情報、在庫 / オーダーの作成、\n"
+"異なった計量単位、梱包、資産をサポートします。\n"
+"\n"
+"価格表サポート：\n"
+"　・ 複数レベルの割引（製品、分類、数量ごと）\n"
+"　・ 異なった基準に基づく価格を計算：\n"
+"　　　・ 他の料金表\n"
+"　　　・ 原価\n"
+"　　　・ リストの価格\n"
+"　　　・ 仕入価格など\n"
+"\n"
+"製品および / またはパートナによる価格リストの好み\n"
+"\n"
+"バーコード付きの製品ラベルの印刷\n"
+"    "
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "View :"
-msgstr ""
+msgstr "ビュー："
 
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr ""
+msgstr "自動ロードの表示"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:264
 #, python-format
 msgid "You cannot remove the field '%s' !"
-msgstr ""
+msgstr "この項目を取り去ることはできません %s。"
 
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
-msgstr ""
+msgstr "許可された会社"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_de
@@ -16501,23 +16542,23 @@ msgstr "ドイツ - 会計"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auction
 msgid "Auction Houses"
-msgstr ""
+msgstr "オークションハウス"
 
 #. module: base
 #: field:ir.ui.menu,web_icon:0
 msgid "Web Icon File"
-msgstr ""
+msgstr "Webアイコンファイル"
 
 #. module: base
 #: view:base.module.upgrade:0
 #: model:ir.ui.menu,name:base.menu_view_base_module_upgrade
 msgid "Apply Scheduled Upgrades"
-msgstr ""
+msgstr "スケジュールされた更新を適用"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_journal
 msgid "Invoicing Journals"
-msgstr ""
+msgstr "請求仕訳帳"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -16527,20 +16568,20 @@ msgstr "ペルシア語 / فارس"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "View Ordering"
-msgstr ""
+msgstr "オーダーの表示"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Unmet dependency !"
-msgstr ""
+msgstr "依存関係が満たされていません。"
 
 #. module: base
 #: view:base.language.import:0
 msgid ""
 "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
 "Portable Objects)"
-msgstr ""
+msgstr "サポートされるファイル形式：*.csv（コンマ区切りの値）、*.po（移植可能オブジェクト）"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:534
@@ -16548,7 +16589,7 @@ msgstr ""
 msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
-msgstr ""
+msgstr "このドキュメントは削除できません（%s）。ユーザがこれらのグループの何れかに属していることを確認して下さい：%s"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_livechat
@@ -16560,6 +16601,12 @@ msgid ""
 "Add \"Support\" button in header from where you can access OpenERP Support.\n"
 "    "
 msgstr ""
+"\n"
+"保守契約を持つ人とのライブチャットによるサポートを有効にします。============================================="
+"======================\n"
+"\n"
+"OpenERPサポートにアクセスできる場所からヘッダにサポートボタンを追加します。\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -16574,49 +16621,53 @@ msgid ""
 "        This module provides the core of the OpenERP web client.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Webコアモジュール\n"
+"        このもモジュールはOpenERP Webクライアントのコアを提供します。\n"
+"        "
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "国の名前は固有であるべきです。"
 
 #. module: base
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "Filename"
-msgstr ""
+msgstr "ファイル名"
 
 #. module: base
 #: field:ir.model,access_ids:0
 #: view:ir.model.access:0
 msgid "Access"
-msgstr ""
+msgstr "アクセス"
 
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovak Republic"
-msgstr ""
+msgstr "スロバキア共和国"
 
 #. module: base
 #: model:ir.ui.menu,name:base.publisher_warranty
 msgid "Publisher Warranty"
-msgstr ""
+msgstr "発行人保証"
 
 #. module: base
 #: model:res.country,name:base.aw
 msgid "Aruba"
-msgstr ""
+msgstr "アルバ"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:60
 #, python-format
 msgid "File is not a zip file!"
-msgstr ""
+msgstr "ファイルがzipファイルでありません。"
 
 #. module: base
 #: model:res.country,name:base.ar
 msgid "Argentina"
-msgstr ""
+msgstr "アルゼンチン"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_issue
@@ -16631,28 +16682,36 @@ msgid ""
 "and decide on their status as they evolve.\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールはプロジェクトの問題 / バグ管理を提供します。\n"
+"=======================================================\n"
+"\n"
+"OpenERPはシステムのバグ、顧客からの苦情、 物理的な故障などプロジェクトが\n"
+"直面する問題を管理します。リストビューはマネジャが問題をすばやくチェックし、\n"
+"それを割り当てそして進展するステータスの上での決定をすることができます。\n"
+"    "
 
 #. module: base
 #: field:res.groups,full_name:0
 msgid "Group Name"
-msgstr ""
+msgstr "グループ名"
 
 #. module: base
 #: model:res.country,name:base.bh
 msgid "Bahrain"
-msgstr ""
+msgstr "バーレーン"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web
 msgid "web"
-msgstr ""
+msgstr "Web"
 
 #. module: base
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner.address,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "FAX"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_nl
@@ -16693,11 +16752,45 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"これはOpenERPのオランダの会計表を管理するためのモジュールです。\n"
+"============================================================================="
+"\n"
+"\n"
+"バージョン情報のために、__openerp__.pyファイルの中の変更履歴をお読み下さい。\n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor "
+"Nederlandse bedrijven te installeren in OpenERP versie 5.\n"
+"\n"
+"De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren, denk b.v. aan intracommunautaire verwervingen\n"
+"waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als voorheffing "
+"weer mag aftrekken.\n"
+"\n"
+"Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen.\n"
+"    * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook "
+"het Nederlandse grootboekschema bevind.\n"
+"\n"
+"    * Als de configuratie wizard start, wordt u gevraagd om de naam van uw "
+"bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel "
+"cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en "
+"de currency om Journalen te creeren.\n"
+"\n"
+"Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit "
+"4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal "
+"verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult "
+"met \"nullen\"\n"
+"\n"
+"    * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via "
+"Financial Management/Configuration/Financial Accounting/Financial "
+"Accounts/Generate Chart of Accounts from a Chart Template.\n"
+"\n"
+"    "
 
 #. module: base
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "コンタクトの検索"
 
 #. module: base
 #: view:ir.attachment:0
@@ -16714,18 +16807,18 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "会社"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_report_designer
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "高度なレポート"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
 #: selection:ir.actions.url,target:0
 msgid "New Window"
-msgstr ""
+msgstr "新規ウィンドウ"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_data
@@ -16735,7 +16828,7 @@ msgstr ""
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contract"
-msgstr ""
+msgstr "発行人保証契約"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -16745,7 +16838,7 @@ msgstr "ブルガリア語 / български език"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "アフターサービス"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr
@@ -16755,17 +16848,17 @@ msgstr "フランス - 会計"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch"
-msgstr ""
+msgstr "起動"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_caldav
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "CalDAVを利用してカレンダーを共有"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
 msgid "Limit"
-msgstr ""
+msgstr "制限"
 
 #. module: base
 #: help:workflow.transition,group_id:0
@@ -16777,18 +16870,18 @@ msgstr "ユーザがこのトランジションを有効にするために許可
 #: code:addons/orm.py:791
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
-msgstr ""
+msgstr "シリアライズ項目%s が（スパース項目 %s のための）見つかりません。"
 
 #. module: base
 #: model:res.country,name:base.jm
 msgid "Jamaica"
-msgstr ""
+msgstr "ジャマイカ"
 
 #. module: base
 #: field:res.partner,color:0
 #: field:res.partner.address,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "カラーインデックス"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_category_form
@@ -16798,11 +16891,13 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"追跡のためのより良い分類を行うためや分析目的のためにパートナの分類を管理して下さい。パートナは幾つかの分類に属している可能性もあり、分類は階層的な構造を持"
+"つかも知れません：パートナの属する分類はその親の分類にも属しています。"
 
 #. module: base
 #: model:res.country,name:base.az
 msgid "Azerbaijan"
-msgstr ""
+msgstr "アゼルバイジャン"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:450
@@ -16814,28 +16909,28 @@ msgstr "警告"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_edi
 msgid "Electronic Data Interchange (EDI)"
-msgstr ""
+msgstr "電子データ交換（EDI）"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_tools
 msgid "Extra Tools"
-msgstr ""
+msgstr "その他ツール"
 
 #. module: base
 #: model:res.country,name:base.vg
 msgid "Virgin Islands (British)"
-msgstr ""
+msgstr "イギリス領ヴァージン諸島"
 
 #. module: base
 #: view:ir.property:0
 #: model:ir.ui.menu,name:base.next_id_15
 msgid "Parameters"
-msgstr ""
+msgstr "パラメータ"
 
 #. module: base
 #: model:res.country,name:base.pm
 msgid "Saint Pierre and Miquelon"
-msgstr ""
+msgstr "サンピエール島・ミクロン島"
 
 #. module: base
 #: model:ir.module.module,description:base.module_email_template
@@ -16883,6 +16978,37 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Eメールのテンプレート化（OpenlabsのオリジナルのPower Emailの簡易バージョン）\n"
+"============================================================================="
+"\n"
+"\n"
+"送信者、受信者、件名、ボディ（HTMLとテキスト）を含む、任意のOpenERPドキュメント\n"
+"（受注オーダー、請求書など）に関連する完全なEメールテンプレートをデザインできます。\n"
+"また、テンプレートにファイルや、レポートを印刷して自動的に添付することができます。\n"
+"\n"
+"高度な使用では、テンプレートにはそれらが関連するドキュメントの動的な属性を含むこと\n"
+"ができます。例えば、それを書く時や、その属性が定義されていない時に安全な\n"
+"デフォルト提供するためにもパートナの国の名前を使うことができます。、\n"
+"それぞれのテンプレートはそれらの動的な値を含むことを助けるための組み込みアシスタント\n"
+"が含まれています。\n"
+"\n"
+"このオプションを有効にしているなら、組み立てアシスタントはテンプレートが適用される\n"
+"OpenERPドキュメント（例えば請求書）のサイドバーに表示されます。\n"
+"これは必要に応じて、レビューや内容の改変をした後で、テンプレートを基本とした\n"
+"新しいEメールを送るための簡単な方法として役立ちます。\n"
+"\n"
+"この組み立てアシスタントは一度に複数のドキュメントのために呼ばれるときには\n"
+"大量メーリングシステムにもなります。\n"
+"\n"
+"任意のOpenERPドキュメント上で大きなキャンペーンを自動化することが必要なら、\n"
+"これらのEメールテンプレートは、マーケティングキャンペーンシステムの心臓部にも\n"
+"なります（マーケティングキャンペーンアプリケーションを参照）。\n"
+"\n"
+"技術的な注記：これは、Openlabsにより維持されるオリジナルのPower Emailに対する\n"
+"単にテンプレート化のシステムです。\n"
+"\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -16892,7 +17018,7 @@ msgstr "チェコ語 / Čeština"
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules
 msgid "Generic Modules"
-msgstr ""
+msgstr "一般的なモジュール"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_supplier_form
@@ -16902,11 +17028,13 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
+"仕入先フォームから仕入先に関する全ての情報にアクセスできます：会計データ、Eメールの履歴、ミーティング、発注など。顧客や見込み客を含む全てのパートナを検索"
+"するためには仕入先のフィルタボタンのチェックを外して下さい。"
 
 #. module: base
 #: model:res.country,name:base.rw
 msgid "Rwanda"
-msgstr ""
+msgstr "ルワンダ"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet
@@ -16927,21 +17055,32 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールはタイムシートシステムを実装します。\n"
+"==========================================\n"
+"\n"
+"それぞれの従業員は異なったプロジェクトに費やした時間のエンコードと追跡ができます。\n"
+"プロジェクトは分析アカウントであり、プロジェクトに費やした時間は分析アカウント上にコストを生成します。\n"
+"\n"
+"時間に関する多数のレポートと従業員追跡が提供されます。\n"
+"\n"
+"これは完全に原価計算モジュールと統合されます。これにより仕事による管理が実現されます。\n"
+"    "
 
 #. module: base
 #: help:ir.mail_server,smtp_port:0
 msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
-msgstr ""
+msgstr "SMTPポートは通常はSSLのために465が、他のケースのために25と587が使われます。"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the week (0:Monday): %(weekday)s"
-msgstr ""
+msgstr "曜日（0：月曜日）：%(weekday)s"
 
 #. module: base
 #: model:res.country,name:base.ck
 msgid "Cook Islands"
-msgstr ""
+msgstr "クック諸島"
 
 #. module: base
 #: field:ir.model.data,noupdate:0
@@ -16951,17 +17090,17 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Klingon"
-msgstr ""
+msgstr "クリンゴン語"
 
 #. module: base
 #: model:res.country,name:base.sg
 msgid "Singapore"
-msgstr ""
+msgstr "シンガポール"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Current Window"
-msgstr ""
+msgstr "現在のウィンドウ"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm
@@ -16999,18 +17138,42 @@ msgid ""
 "    * Opportunities by Stage (graph)\n"
 "    * Planned Revenue by Stage and User (graph)\n"
 msgstr ""
+"\n"
+"一般的なOpenERPのCRM（Customer Relationship Management）\n"
+"=====================================================\n"
+"\n"
+"このシステムは人々のグループがリード、オポチュニティ、ミーティング、電話他を知的に効果的に\n"
+"管理することを可能にします。これはコミュニケーション、身分証明、優先度付け、割り当て、\n"
+"問題解決、通知といった主要なタスクを管理します。\n"
+"\n"
+"OpenERPはユーザ、顧客、仕入先による全てのケースが正常に追跡されることを保証します。\n"
+"自動的にリマインダーを送信し、リクエストを徐々に拡大し、特定のメソッドと自身の会社のルール\n"
+"に基づく多くの他のアクションをトリガすることができます。\n"
+"\n"
+"このシステムで最大のものはユーザは特別な何かをする必要がないことです。\n"
+"単にリクエストの追跡のためにEメールを送信するだけです。OpenERPは彼らの\n"
+"メッセージに敬意を持って取り扱い、自動的に適切なスタッフにルーティングし、\n"
+"そしてこの先の対応が正しい場所に到達することを確実にします。\n"
+"\n"
+"CRMモジュールはメールとOpenERPの間を同期インタフェースするために\n"
+"Eメールゲートウェイを持ちます。\n"
+"\n"
+"CRMのために作成されるダッシュボードは次のものを含みます：\n"
+"　・ 分類別のオポチュニティ（グラフ）\n"
+"　・ ステージ別のオポチュニティ（グラフ）\n"
+"　・ ステージとユーザ別の計画収益（グラフ）\n"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_accounting_and_finance
 msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing."
-msgstr ""
+msgstr "会計処理に必要な手助けをします。あなたが会計士でないなら請求書処理のみをインストールすることをお勧めします。"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "Thunderbirdプラグイン"
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -17023,7 +17186,7 @@ msgstr ""
 #: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "国"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_messages
@@ -17033,7 +17196,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pn
 msgid "Pitcairn Island"
-msgstr ""
+msgstr "ピトケアン島"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_tests
@@ -17042,39 +17205,42 @@ msgid ""
 "        OpenERP Web test suite.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Webテストスイート\n"
+"        "
 
 #. module: base
 #: view:ir.values:0
 msgid "Action Bindings/Defaults"
-msgstr ""
+msgstr "アクションバインディング / デフォルト"
 
 #. module: base
 #: view:ir.rule:0
 msgid ""
 "1. Global rules are combined together with a logical AND operator, and with "
 "the result of the following steps"
-msgstr ""
+msgstr "1. グローバルなルールは論理AND演算子により、ともに結合されます。その結果は、以下のステップとなります。"
 
 #. module: base
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Change Color"
-msgstr ""
+msgstr "色の変更"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "IT sector"
-msgstr ""
+msgstr "ITセクター"
 
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Select Groups"
-msgstr ""
+msgstr "グループを選択"
 
 #. module: base
 #: view:res.lang:0
 msgid "%X - Appropriate time representation."
-msgstr ""
+msgstr "%X - 適切な時刻の表現"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17089,32 +17255,35 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"0 < n の時に、セパレータのフォーマットは [,n] のようにすべきです：ユニットディジットが -1 "
+"から始まるとセパレーションの終了です。例えば、[3,2,-1] は 106500 を 1,06,500 に；[1,2,-1] は 106,50,0 "
+"に；[3] は 106,500 となります。それぞれのケースでは千のセパレータとして\",\"を与えて下さい。"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
 msgid "Automatic Installation"
-msgstr ""
+msgstr "自動インストール"
 
 #. module: base
 #: model:res.country,name:base.jp
 msgid "Japan"
-msgstr ""
+msgstr "日本"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:357
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "リネームは一度に１カラムしかできません。"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Button"
-msgstr ""
+msgstr "ウィザードボタン"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Report/Template"
-msgstr ""
+msgstr "レポート / テンプレート"
 
 #. module: base
 #: model:ir.module.module,description:base.module_marketing_campaign
@@ -17145,13 +17314,33 @@ msgid ""
 "Leads.\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールはマーケティングキャンペーン（キャンペーンは実際、単なるCRMリードではなく、何れかのリソースにより定義されます）を通してリードの自動化を提"
+"供します。\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"キャンペーンは動的でマルチチャンネルです。そのプロセスは次のとおりです：\n"
+"　・ "
+"マーケティングキャンペーンはワークフローのようにデザインして下さい。これには送信用のEメールテンプレート、プリントしてEメールで送信するレポート、カスタム"
+"アクションなどが含まれます。\n"
+"　・ キャンペーンで入力すべき項目（例えば、確かな国からのリードなど）を選択した入力セグメントの定義をして下さい。\n"
+"　・ キャンペーンをテストのためにリアルタイムあるいは加速状態でシミュレーションモードで実行して下さい。その後、微調整します。\n"
+"　・ 各アクションが手動の検証を必要とする場合は、手動で実際のキャンペーンを開始することもできます。\n"
+"　・ 最後にキャンペーンを実際に起動し、キャンペーンの全てが完全に自動的に行われるよう統計値を監視します。\n"
+"\n"
+"キャンペーンの実行中にも、ちろんパラメータ、入力背具面tp、ワークフローなどの微調整を続ける事ができます。\n"
+"\n"
+"注記：デモデータが必要なら、marketing_campaign_crm_demoモジュールをインストールできます。それはCRMリードに依存するため、CR"
+"Mアプリケーションもインストールすることになります。\n"
+"    "
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Graph"
-msgstr ""
+msgstr "グラフ"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_server
@@ -17171,32 +17360,32 @@ msgstr "カナダ - 会計"
 #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 #: model:ir.ui.menu,name:base.next_id_11
 msgid "Configuration Wizards"
-msgstr ""
+msgstr "設定ウィザード"
 
 #. module: base
 #: field:res.lang,code:0
 msgid "Locale Code"
-msgstr ""
+msgstr "ロケールコード"
 
 #. module: base
 #: field:workflow.activity,split_mode:0
 msgid "Split Mode"
-msgstr ""
+msgstr "分割モード"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Note that this operation might take a few minutes."
-msgstr ""
+msgstr "この操作は数分を要しますのでご注意下さい。"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localisation"
-msgstr ""
+msgstr "ローカル化"
 
 #. module: base
 #: field:ir.sequence,implementation:0
 msgid "Implementation"
-msgstr ""
+msgstr "実装"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ve
@@ -17206,39 +17395,39 @@ msgstr "ベネズエラ - 会計"
 #. module: base
 #: model:res.country,name:base.cl
 msgid "Chile"
-msgstr ""
+msgstr "チリ"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Execution"
-msgstr ""
+msgstr "実行"
 
 #. module: base
 #: field:ir.actions.server,condition:0
 #: view:ir.values:0
 #: field:workflow.transition,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "条件"
 
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
-msgstr ""
+msgstr "レートが1である通貨に対しての通貨のレート"
 
 #. module: base
 #: field:ir.ui.view,name:0
 msgid "View Name"
-msgstr ""
+msgstr "ビュー名"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_ftp
 msgid "Shared Repositories (FTP)"
-msgstr ""
+msgstr "共有リポジトリ（FTP）"
 
 #. module: base
 #: model:ir.model,name:base.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "アクセスグループ"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17248,7 +17437,7 @@ msgstr "イタリア語 / Italiano"
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save As Attachment Prefix"
-msgstr ""
+msgstr "プレフィックスを付けて保存"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -17256,16 +17445,17 @@ msgid ""
 "Only one client action will be executed, last client action will be "
 "considered in case of multiple client actions."
 msgstr ""
+"１つのクライアントアクションのみが実行されます。複数のクライアントアクションがあるケースには、最後のクライアントアクションが認識されます。"
 
 #. module: base
 #: model:res.country,name:base.hr
 msgid "Croatia"
-msgstr ""
+msgstr "クロアチア"
 
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
-msgstr ""
+msgstr "携帯電話番号"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_by_category
@@ -17274,27 +17464,27 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 #: view:res.partner.category:0
 msgid "Partner Categories"
-msgstr ""
+msgstr "パートナ分類"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "System Update"
-msgstr ""
+msgstr "システム アップデート"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Field"
-msgstr ""
+msgstr "ウィザード項目"
 
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr ""
+msgstr "順序のためのレコードのプレフィックス値"
 
 #. module: base
 #: model:res.country,name:base.sc
 msgid "Seychelles"
-msgstr ""
+msgstr "セーシェル"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
@@ -17304,39 +17494,39 @@ msgstr ""
 #: field:res.company,bank_ids:0
 #: view:res.partner.bank:0
 msgid "Bank Accounts"
-msgstr ""
+msgstr "銀行口座"
 
 #. module: base
 #: field:ir.model,modules:0
 #: field:ir.model.fields,modules:0
 msgid "In modules"
-msgstr ""
+msgstr "モジュール内"
 
 #. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
-msgstr ""
+msgstr "シエラレオネ"
 
 #. module: base
 #: view:res.company:0
 #: view:res.partner:0
 msgid "General Information"
-msgstr ""
+msgstr "一般的な情報"
 
 #. module: base
 #: model:res.country,name:base.tc
 msgid "Turks and Caicos Islands"
-msgstr ""
+msgstr "タークス・カイコス諸島"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_project_issue
 msgid "eMail Gateway for Project Issues"
-msgstr ""
+msgstr "プロジェクトの問題のためのEメールゲートウェイ"
 
 #. module: base
 #: field:res.partner.bank,partner_id:0
 msgid "Account Owner"
-msgstr ""
+msgstr "アカウント所有者"
 
 #. module: base
 #: code:addons/base/res/res_users.py:270
@@ -17347,7 +17537,7 @@ msgstr "会社切替の警告"
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
-msgstr ""
+msgstr "グルジア"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_manufacturing
@@ -17359,99 +17549,99 @@ msgstr "製造プロセスを管理し、それらのプロセスのレポート
 #. module: base
 #: help:ir.sequence,number_increment:0
 msgid "The next number of the sequence will be incremented by this number"
-msgstr ""
+msgstr "シーケンスの次の番号はこの数値の分だけ増加させられます。"
 
 #. module: base
 #: code:addons/orm.py:341
 #, python-format
 msgid "Wrong ID for the browse record, got %r, expected an integer."
-msgstr ""
+msgstr "ブラウズレコードのためには間違ったIDです。取得したのは %r ですが、 整数が期待されます。"
 
 #. module: base
 #: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
-msgstr ""
+msgstr "機能"
 
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr ""
+msgstr "ウィジットの検索"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
 "Manage relations with prospects and customers using leads, opportunities, "
 "requests or issues."
-msgstr ""
+msgstr "リード、オポチュニティ、リクエスト、問題を使って、見込み客や顧客との関係を管理することができます。"
 
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Delivery"
-msgstr ""
+msgstr "配達"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
 msgid "Corp."
-msgstr ""
+msgstr "会社"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_requisition
 msgid "Purchase Requisitions"
-msgstr ""
+msgstr "発注依頼"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Months"
-msgstr ""
+msgstr "月"
 
 #. module: base
 #: view:workflow.instance:0
 msgid "Workflow Instances"
-msgstr ""
+msgstr "ワークフローインスタンス"
 
 #. module: base
 #: code:addons/base/res/res_partner.py:284
 #, python-format
 msgid "Partners: "
-msgstr ""
+msgstr "パートナ： "
 
 #. module: base
 #: field:res.partner.bank,name:0
 msgid "Bank Account"
-msgstr ""
+msgstr "銀行口座"
 
 #. module: base
 #: model:res.country,name:base.kp
 msgid "North Korea"
-msgstr ""
+msgstr "北朝鮮"
 
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Create Object"
-msgstr ""
+msgstr "オブジェクトの作成"
 
 #. module: base
 #: view:ir.filters:0
 #: field:res.log,context:0
 msgid "Context"
-msgstr ""
+msgstr "コンテキスト"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_mrp
 msgid "Sales and MRP Management"
-msgstr ""
+msgstr "受注とMRP管理"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_sms_send
 msgid "Send an SMS"
-msgstr ""
+msgstr "SMSを送信"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Prospect"
-msgstr ""
+msgstr "見込み客"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
@@ -17474,31 +17664,37 @@ msgid ""
 "are accessible if installed.\n"
 "    "
 msgstr ""
+"\n"
+"ツールモジュールのための共通基盤\n"
+"==============================\n"
+"\n"
+"もしインストールされている場合、調査、昼食、アイデアなどのツールがアクセス可能な場所から、ツールのためのメニューリンクを作成します。\n"
+"    "
 
 #. module: base
 #: field:ir.exports,name:0
 msgid "Export Name"
-msgstr ""
+msgstr "エクスポート名"
 
 #. module: base
 #: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
-msgstr ""
+msgstr "受発注のドキュメントの内容に応じて、自動的に正しいアドレスを選択するために使用されます。"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_widget_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_act_window
 msgid "Homepage Widgets"
-msgstr ""
+msgstr "ホームページウィジット"
 
 #. module: base
 #: help:res.company,rml_footer2:0
 msgid ""
 "This field is computed automatically based on bank accounts defined, having "
 "the display on footer checkbox set."
-msgstr ""
+msgstr "この項目はフッターのチェックボックスセット上に表示された定義された銀行口座に基づいて自動的に計算されます。"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_subproduct
@@ -17518,6 +17714,19 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールは１つの製造オーダーから幾つかの製品を製造することができます。\n"
+"============================================================================="
+"\n"
+"\n"
+"部品表でサブプロダクトを構成できます。\n"
+"\n"
+"このモジュールを使用しない場合：\n"
+"    A + B + C -> D\n"
+"\n"
+"このモジュールを使用した場合：\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.lk
@@ -17550,6 +17759,26 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールは何の開発もなしで新しいモジュールの作成ができます。\n"
+"======================================================================\n"
+"\n"
+"これは記録セッションの中でオブジェクトの全ての操作を記録します。そして、\n"
+".ZIPモジュールを生成します。それによって、OpenERPクライアントから直接\n"
+"独自モジュールを作成することができます。\n"
+"\n"
+"このバージョンは作成と既存のレコードの更新にために動作します。それは依存関係と、\n"
+"全てのウィジットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
+"また、ワークフローとデモ / 更新データもサポートします。\n"
+"\n"
+"カスタム設定とデモ / テストデータのために、簡単に再利用と公表可能なモジュールを\n"
+"作成するために役立つはずです。\n"
+"\n"
+"利用方法：\n"
+"モジュールウィザードの アドミニストレーション/カスタマイゼーション/モジュール \n"
+"作成/エクスポート カスタマイゼーション を実行します。\n"
+"記録の日時の基準、記録されるオブジェクト、記録モジュールを選択して下さい。\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0

From dfda972285d25802a696ed4671fad515a23c2446 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 17 Apr 2012 05:24:01 +0000
Subject: [PATCH 64/90] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120417045202-9zgk4szsg252hiln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120417052401-zew26x0fyljrziw5
---
 addons/account/i18n/ja.po                     | 10428 ++++++++++++++++
 addons/account_analytic_analysis/i18n/ja.po   |     8 +-
 addons/account_analytic_default/i18n/gu.po    |   183 +
 addons/account_analytic_default/i18n/ja.po    |     8 +-
 addons/account_analytic_plans/i18n/gu.po      |   542 +
 addons/account_anglo_saxon/i18n/gu.po         |    98 +
 addons/account_anglo_saxon/i18n/ja.po         |    65 +-
 addons/account_asset/i18n/ja.po               |     6 +-
 .../i18n/ja.po                                |   100 +-
 .../i18n/pt.po                                |   386 +
 addons/account_check_writing/i18n/pt.po       |   210 +
 addons/account_invoice_layout/i18n/gu.po      |   355 +
 addons/auction/i18n/gu.po                     |  2357 ++++
 addons/crm/i18n/ja.po                         |   150 +-
 addons/hr/i18n/ja.po                          |   695 +
 addons/hr_payroll/i18n/ja.po                  |     4 +-
 addons/mrp_repair/i18n/sr@latin.po            |    12 +-
 addons/web/i18n/gu.po                         |  1544 +++
 addons/web/i18n/nl.po                         |     8 +-
 addons/web_diagram/i18n/bs.po                 |    57 +
 addons/web_gantt/i18n/bs.po                   |    28 +
 addons/web_graph/i18n/bs.po                   |    23 +
 addons/web_kanban/i18n/bs.po                  |    55 +
 23 files changed, 17160 insertions(+), 162 deletions(-)
 create mode 100644 addons/account/i18n/ja.po
 create mode 100644 addons/account_analytic_default/i18n/gu.po
 create mode 100644 addons/account_analytic_plans/i18n/gu.po
 create mode 100644 addons/account_anglo_saxon/i18n/gu.po
 create mode 100644 addons/account_bank_statement_extensions/i18n/pt.po
 create mode 100644 addons/account_check_writing/i18n/pt.po
 create mode 100644 addons/account_invoice_layout/i18n/gu.po
 create mode 100644 addons/auction/i18n/gu.po
 create mode 100644 addons/hr/i18n/ja.po
 create mode 100644 addons/web/i18n/gu.po
 create mode 100644 addons/web_diagram/i18n/bs.po
 create mode 100644 addons/web_gantt/i18n/bs.po
 create mode 100644 addons/web_graph/i18n/bs.po
 create mode 100644 addons/web_kanban/i18n/bs.po

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
new file mode 100644
index 00000000000..781f574222c
--- /dev/null
+++ b/addons/account/i18n/ja.po
@@ -0,0 +1,10428 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-17 04:15+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "last month"
+msgstr "先月"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr "システム支払い"
+
+#. module: account
+#: view:account.journal:0
+msgid "Other Configuration"
+msgstr "その他の設定"
+
+#. module: account
+#: help:account.tax.code,sequence:0
+msgid ""
+"Determine the display order in the report 'Accounting \\ Reporting \\ "
+"Generic Reporting \\ Taxes \\ Taxes Report'"
+msgstr "会計 \\ レポート \\ 一般的なレポート \\ 税金 \\ 税金レポート にあるレポートの表示順を決定して下さい。"
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr "仕訳帳入力の調整"
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr "アカウントの統計情報"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma/Open/Paid Invoices"
+msgstr "請求書のプロフォーマ / オープン / 支払い済"
+
+#. module: account
+#: field:report.invoice.created,residual:0
+msgid "Residual"
+msgstr "残余"
+
+#. module: account
+#: constraint:account.period:0
+msgid "Error ! The duration of the Period(s) is/are invalid. "
+msgstr "エラー。期間の長さが無効です。 "
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "アカウントの通貨"
+
+#. module: account
+#: view:account.tax:0
+msgid "Children Definition"
+msgstr "子の定義"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:302
+#, python-format
+msgid "Journal item \"%s\" is not valid."
+msgstr "仕訳項目 %s は有効ではありません。"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "今日までの売掛金の年齢"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Import from invoice or payment"
+msgstr "請求書や支払いからインポート"
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr "借方合計"
+
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disabled"
+msgstr "取引を調整しない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
+
+#. module: account
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "設定エラー。選択された通貨はデフォルトアカウントによっても共有されなければなりません。"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr "起点"
+
+#. module: account
+#: view:account.account:0
+#: view:account.automatic.reconcile:0
+#: field:account.move.line,reconcile_id:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Reconcile"
+msgstr "調整"
+
+#. module: account
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: view:account.invoice:0
+#: field:account.move,ref:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Choose Fiscal Year "
+msgstr "年度の選択 "
+
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr "アクティブ項目がFalseに設定されている場合、支払条件を削除することなく非表示にできます。"
+
+#. module: account
+#: code:addons/account/account_invoice.py:1428
+#, python-format
+msgid "Warning!"
+msgstr "警告"
+
+#. module: account
+#: code:addons/account/account.py:3112
+#, python-format
+msgid "Miscellaneous Journal"
+msgstr "その他の仕訳帳"
+
+#. module: account
+#: field:account.fiscal.position.account,account_src_id:0
+#: field:account.fiscal.position.account.template,account_src_id:0
+msgid "Account Source"
+msgstr "元アカウント"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
+msgid "All Analytic Entries"
+msgstr "全ての分析エントリー"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "過去15日以内に作成済み請求書"
+
+#. module: account
+#: field:accounting.report,label_filter:0
+msgid "Column Label"
+msgstr "列ラベル"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr "仕訳帳：%s"
+
+#. module: account
+#: help:account.analytic.journal,type:0
+msgid ""
+"Gives the type of the analytic journal. When it needs for a document (eg: an "
+"invoice) to create analytic entries, OpenERP will look for a matching "
+"journal of the same type."
+msgstr ""
+"分析仕訳帳のタイプを与えて下さい。分析エントリーを作成するためのドキュメント（例えば請求書）のために必要な場合、OpenERPは同じタイプの一致する仕訳帳"
+"を探します。"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
+msgid "Tax Templates"
+msgstr "税金テンプレート"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_select
+msgid "Move line reconcile select"
+msgstr "調整のため選択する行の移動"
+
+#. module: account
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr "この税金コードに関連するどんなVATも請求書上に現れるのを望まない場合は、このボックスをチェックして下さい。"
+
+#. module: account
+#: code:addons/account/account_invoice.py:1241
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+msgstr "請求書 %s は部分的に支払われます：%s%s / %s%s（%s%s 残り）"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries are an input of the reconciliation."
+msgstr "会計エントリーは調整の入力です。"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr "ベルギーのレポート"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1200
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "閉じられた仕訳帳のエントリーを追加 / 削除することはできません。"
+
+#. module: account
+#: help:account.account,user_type:0
+msgid ""
+"Account Type is used for information purpose, to generate country-specific "
+"legal reports, and set the rules to close a fiscal year and generate opening "
+"entries."
+msgstr ""
+"アカウントタイプは、各国固有の法律上のレポートを作成し、そして会計年度を終了させて開始エントリーを生成するためのルールを設定するための情報目的で使用されま"
+"す。"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
+#: model:ir.actions.act_window,name:account.action_view_account_use_model
+#: model:ir.ui.menu,name:account.menu_action_manual_recurring
+msgid "Manual Recurring"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscalyear"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:551
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+msgstr ""
+
+#. module: account
+#: help:account.installer,charts:0
+msgid ""
+"Installs localized accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile
+msgid "Account Unreconcile"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,style_overwrite:0
+msgid ""
+"You can set up here the format you want this record to be displayed. If you "
+"leave the automatic formatting, it will be computed based on the financial "
+"reports hierarchy (auto-computed field 'level')."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
+"Cash Registers, or Customer/Supplier payments."
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr ""
+
+#. module: account
+#: field:account.open.closed.fiscalyear,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr ""
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid ""
+"This field contains the informatin related to the numbering of the journal "
+"entries of this journal."
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open For Unreconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,chart_template_id:0
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: field:accounting.report,enable_filter:0
+msgid "Enable Comparison"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,state:0
+msgid ""
+"When journal period is created. The state is 'Draft'. If a report is printed "
+"it comes to 'Printed' state. When all transactions are done, it comes in "
+"'Done' state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_tax_chart
+msgid ""
+"Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
+"tax codes) and shows the current tax situation. The tax chart represents the "
+"amount of each area of the tax declaration for your country. It’s presented "
+"in a hierarchical structure, which can be modified to fit your needs."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,journal_id:0
+#: view:account.invoice:0
+#: field:account.invoice,journal_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: field:account.move.bank.reconcile,journal_id:0
+#: view:account.move.line:0
+#: field:account.move.line,journal_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: field:validate.account.move,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr ""
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,chart_account_id:0
+#: help:account.balance.report,chart_account_id:0
+#: help:account.central.journal,chart_account_id:0
+#: help:account.common.account.report,chart_account_id:0
+#: help:account.common.journal.report,chart_account_id:0
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: help:account.general.journal,chart_account_id:0
+#: help:account.partner.balance,chart_account_id:0
+#: help:account.partner.ledger,chart_account_id:0
+#: help:account.print.journal,chart_account_id:0
+#: help:account.report.general.ledger,chart_account_id:0
+#: help:account.vat.declaration,chart_account_id:0
+#: help:accounting.report,chart_account_id:0
+msgid "Select Charts of Accounts"
+msgstr ""
+
+#. module: account
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Tax Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "   30 Days   "
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_report_id:0
+#: selection:account.financial.report,type:0
+msgid "Report Value"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1251
+#, python-format
+msgid "No period found or more than one period found for the given date."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3116
+#, python-format
+msgid "SAJ"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:750
+#: code:addons/account/account_move_line.py:803
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:297
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+#, python-format
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Sale journal in this year"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children with hierarchy"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/project/wizard/project_account_analytic_line.py:47
+#: model:ir.model,name:account.model_project_account_analytic_line
+#, python-format
+msgid "Analytic Entries by line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Method"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report
+msgid "Financial Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.financial.report,type:0
+#: field:account.invoice,type:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,type:0
+#: view:account.journal:0
+#: field:account.journal,type:0
+#: field:account.move.reconcile,type:0
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:738
+#, python-format
+msgid ""
+"Taxes are missing!\n"
+"Click on compute button."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Supplier Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal_report
+msgid "Account Analytic Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_automatic_reconcile
+msgid "Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_gain_loss
+msgid ""
+"When doing multi-currency transactions, you may loose or gain some amount "
+"due to changes of exchange rate. This menu gives you a forecast of the Gain "
+"or Loss you'd realized if those transactions were ended today. Only for "
+"accounts having a secondary currency set."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,nocreate:0
+msgid ""
+"If checked, the new chart of accounts will not contain this by default."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:110
+#, python-format
+msgid ""
+"Can not %s invoice which is already reconciled, invoice should be "
+"unreconciled first. You can only Refund this invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: refund invoice and reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_chart
+#: model:ir.actions.act_window,name:account.action_tax_code_tree
+#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
+msgid "Chart of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1345
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid ""
+"This account does not allow reconciliation! You should update the account "
+"definition to change this."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_liability
+#: model:account.financial.report,name:account.account_financial_report_liability0
+#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
+msgid "Liability"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"If the Tax account is a tax code account, this field will contain the taxed "
+"amount.If the tax account is base tax code, this field will contain the "
+"basic amount(without tax)."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2596
+#, python-format
+msgid "I can not locate a parent code for the template account!"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2268
+#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_invoice.py:73
+#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_move_line.py:173
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+#: view:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
+#: model:ir.ui.menu,name:account.menu_account_partner_balance_report
+msgid "Partner Balance"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_reserve_and_surplus_account:0
+#: field:res.company,property_reserve_and_surplus_account:0
+msgid "Reserve and Profit/Loss Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,landscape:0
+msgid "Landscape Mode"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:645
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort by"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,user_type:0
+msgid ""
+"These types are defined according to your country. The type contains more "
+"information about the account and its specificities."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:842
+#, python-format
+msgid ""
+"You have to provide an account for the write off/exchange difference entry !"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
+#: model:ir.ui.menu,name:account.journal_cash_move_lines
+msgid "Cash Registers"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "-"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:res.groups,name:account.group_account_manager
+msgid "Manager"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unbalanced Journal Items"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_bank
+#: selection:account.bank.accounts.wizard,account_type:0
+#: code:addons/account/account.py:3003
+#, python-format
+msgid "Bank"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+msgstr ""
+
+#. module: account
+#: help:account.account,foreign_balance:0
+msgid ""
+"Total amount (in Secondary currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_dest_id:0
+#: field:account.fiscal.position.tax.template,tax_dest_id:0
+msgid "Replacement Tax"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "All Months Sales by type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"With Supplier Invoices you can enter and manage invoices issued by your "
+"suppliers. OpenERP can also generate draft invoices automatically from "
+"purchase orders or receipts. This way, you can control the invoice from your "
+"supplier according to what you purchased or received."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.journal,code:0
+msgid "The code will be displayed on reports."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1302
+#, python-format
+msgid ""
+"You can not use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal !"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Entry Label"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1129
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Draft Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.action_account_entries_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
+msgid "Entries Analysis"
+msgstr ""
+
+#. module: account
+#: field:account.account,level:0
+#: field:account.financial.report,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_report_common.py:144
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitandloss0
+msgid "Profit and Loss"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Search tax template"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_reconcile_select
+#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
+msgid "Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.partner.balance,display_partner:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,code_digits:0
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"A journal entry consists of several journal items, each of which is either a "
+"debit or a credit transaction. OpenERP automatically creates one journal "
+"entry per accounting document: invoice, refund, supplier payment, bank "
+"statements, etc."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+msgstr ""
+
+#. module: account
+#: help:account.fiscal.position,active:0
+msgid ""
+"By unchecking the active field, you may hide a fiscal position without "
+"deleting it."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_temp_range
+msgid "A Temporary table used for Dashboard view"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree4
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
+msgid "Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "and Journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to next partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unposted Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"A bank statement is a summary of all financial transactions occurring over a "
+"given period of time on a deposit account, a credit card or any other type "
+"of financial account. The starting balance will be proposed automatically "
+"and the closing balance is to be found on your statement. When you are in "
+"the Payment column of a line, you can press F1 to open the reconciliation "
+"form."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,general_account_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_analytic0
+#: model:process.node,note:account.process_node_analyticcost0
+msgid "Analytic costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
+msgid "Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
+"cancel the current invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1429
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "This wizard will change the currency of the invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid ""
+"Display your company chart of accounts per fiscal year and filter by period. "
+"Have a complete tree view of all journal items per account code by clicking "
+"on an account."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Debit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
+msgid "Receivables & Payables"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:analytic.entries.report:0
+msgid "My Entries"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:292
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Credit Notes"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:407
+#: code:addons/account/account.py:412
+#: code:addons/account/account.py:429
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
+msgid "Invoices Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,subtotal:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.treasury.report:0
+#: model:ir.actions.act_window,name:account.action_account_treasury_report_all
+#: model:ir.model,name:account.model_account_treasury_report
+#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
+msgid "Treasury Analysis"
+msgstr ""
+
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
+msgid "Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:339
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: selection:account.move.line,state:0
+msgid "Valid"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_journal
+#: model:ir.model,name:account.model_account_print_journal
+msgid "Account Print Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "/"
+msgstr ""
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+msgid ""
+"This account is used for transferring Profit/Loss (If It is Profit: Amount "
+"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
+"Loss Report"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Comparison between accounting and payment entries"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+msgid ""
+"Check this box if you want to use a different sequence for each created "
+"journal. Otherwise, all will use the same sequence."
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,amount_currency:0
+#: help:account.report.general.ledger,amount_currency:0
+msgid ""
+"It adds the currency column if the currency is different then the company "
+"currency"
+msgstr ""
+
+#. module: account
+#: help:account.journal,allow_date:0
+msgid ""
+"If set to True then do not accept the entry if the entry date is not into "
+"the period dates"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s'!"
+msgstr ""
+
+#. module: account
+#: field:account.installer,config_logo:0
+#: field:wizard.multi.charts.accounts,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
+msgid "Makes a generic system to draw financial reports easily."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a sale journal."
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Italic Text (smaller)"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+msgid "VAT Declaration"
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: field:account.treasury.report,fiscalyear_id:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import of the statement in the system from an electronic file"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Validations"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Invalid period ! Some periods overlap or the date period is not in the scope "
+"of the fiscal year. "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:357
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1461
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: help:account.account.template,type:0
+#: help:account.entries.report,type:0
+msgid ""
+"This type is used to differentiate types with special effects in OpenERP: "
+"view can not have entries, consolidation are accounts that can have children "
+"accounts for multi-company consolidations, payable/receivable are for "
+"partners accounts (for debit/credit computations), closed for depreciated "
+"accounts."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Search Chart of Account Templates"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece!\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:787
+#, python-format
+msgid ""
+"You can not modify the company of this journal as its related record exist "
+"in journal items"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"The default Chart of Accounts is matching your country selection. If no "
+"certified Chart of Accounts exists for your specified country, a generic one "
+"can be installed and will be selected by default."
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: field:account.account.type,note:0
+#: view:account.analytic.account:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: field:account.invoice.refund,description:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3119
+#, python-format
+msgid "ECNJ"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_income_categ:0
+#: field:product.template,property_account_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:370
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: report:account.central.journal:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.common.account.report,fiscalyear_id:0
+#: field:account.common.journal.report,fiscalyear_id:0
+#: field:account.common.partner.report,fiscalyear_id:0
+#: field:account.common.report,fiscalyear_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: field:account.general.journal,fiscalyear_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.period,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.sequence.fiscalyear,fiscalyear_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id_cmp:0
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,fiscalyear_id:0
+#: help:account.balance.report,fiscalyear_id:0
+#: help:account.central.journal,fiscalyear_id:0
+#: help:account.common.account.report,fiscalyear_id:0
+#: help:account.common.journal.report,fiscalyear_id:0
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: help:account.general.journal,fiscalyear_id:0
+#: help:account.partner.balance,fiscalyear_id:0
+#: help:account.partner.ledger,fiscalyear_id:0
+#: help:account.print.journal,fiscalyear_id:0
+#: help:account.report.general.ledger,fiscalyear_id:0
+#: help:account.vat.declaration,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id_cmp:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,account_line_id:0
+msgid "Account Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1468
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
+msgid ""
+"Setup your accounting journals. For bank accounts, it's better to use the "
+"'Setup Your Bank Accounts' tool that will automatically create the accounts "
+"and journals for you."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:402
+#, python-format
+msgid ""
+"In order to delete a bank statement, you must first cancel it to delete "
+"related journal items."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
+msgid "Fiscal Positions"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: view:account.open.closed.fiscalyear:0
+#: selection:account.period,state:0
+#: code:addons/account/wizard/account_move_journal.py:106
+#: selection:report.invoice.created,state:0
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftinvoices0
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Draft state of an invoice"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:572
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_advance
+#: model:account.payment.term,note:account.account_payment_term_advance
+msgid "30% Advance End 30 Days"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Unreconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice tax."
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a VAT declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The information required for a tax "
+"declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
+msgid "Confirm Draft Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3117
+#, python-format
+msgid "EXJ"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid ""
+"The fiscal position will determine taxes and the accounts used for the "
+"partner."
+msgstr ""
+
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
+msgid "Account move line reconcile (writeoff)"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_tax
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.financial.report,account_ids:0
+#: selection:account.financial.report,type:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:369
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Date:"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Label"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:res.partner.bank:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
+msgid "Bank reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Ref"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_code_id:0
+msgid "The Account can either be a base tax code or a tax code account."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model, they must be positive!"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_base_code_id:0
+#: field:account.tax.template,ref_base_code_id:0
+msgid "Refund Base Code"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:accounting.report:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,parent_id:0
+msgid "Parent Chart Template"
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not configured properly !"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid ""
+"Automatically generate entries based on what has been entered in the  system "
+"before a specific date."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
+#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
+msgid "New Company Financial Setting"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Your Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+msgid "Sales by Account"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid "No sequence defined on the journal !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2268
+#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_move_line.py:173
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:407
+#, python-format
+msgid ""
+"You need an Opening journal with centralisation checked to set the initial "
+"balance!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+#: model:ir.actions.act_window,name:account.action_tax_code_list
+#: model:ir.ui.menu,name:account.menu_action_tax_code_list
+msgid "Tax codes"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Unrealized Gains and losses"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period to"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "August"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Payment entries are the second input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,quantity:0
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 2:"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_expense_categ:0
+#: field:product.template,property_account_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:392
+#, python-format
+msgid ""
+"You can not delete an invoice which is open or paid. We suggest you to "
+"refund it instead."
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1013
+#, python-format
+msgid "Invoice  '%s' is validated."
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+msgid ""
+"The maturity date of the generated entries for this model. You can choose "
+"between the creation date or the creation date of the entries plus the "
+"partner payment terms."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report_pl
+msgid "Profit And Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:735
+#, python-format
+msgid ""
+"Tax base different!\n"
+"Click on compute to update the tax base."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,account_report_id:0
+#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
+msgid "Account Reports"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Cash Transaction"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
+msgid "Sale/Purchase Journals"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,code_digits:0
+#: help:wizard.multi.charts.accounts,code_digits:0
+msgid "No. of Digits to use for account code"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+#: selection:account.financial.report,type:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3363
+#: code:addons/account/account_bank.py:90
+#, python-format
+msgid "BNK"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Day of the Month: 0"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Starts on"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
+
+#. module: account
+#: help:account.journal.column,sequence:0
+msgid "Gives the sequence order to journal column."
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: help:account.account.template,currency_id:0
+#: help:account.bank.accounts.wizard,currency_id:0
+msgid "Forces all moves for this account to have this secondary currency."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move_line
+msgid ""
+"This wizard will validate all journal entries of a particular journal and "
+"period. Once journal entries are validated, you can not update them anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_chart_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
+msgid "Chart of Accounts Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+msgid "Generate Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This months' Sales by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" 'Unreconciled' will copy only the journal items that were unreconciled on "
+"the first day of the new fiscal year."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,journal_ids:0
+#: field:account.analytic.cost.ledger.journal.report,journal:0
+#: field:account.balance.report,journal_ids:0
+#: field:account.central.journal,journal_ids:0
+#: field:account.common.account.report,journal_ids:0
+#: field:account.common.journal.report,journal_ids:0
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.journal.period:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,journal_ids:0
+#: field:account.partner.ledger,journal_ids:0
+#: view:account.print.journal:0
+#: field:account.print.journal,journal_ids:0
+#: field:account.report.general.ledger,journal_ids:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,journal_ids:0
+#: field:accounting.report,journal_ids:0
+#: model:ir.actions.act_window,name:account.action_account_journal_form
+#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
+#: model:ir.ui.menu,name:account.menu_account_print_journal
+#: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
+#: model:ir.ui.menu,name:account.menu_journals_report
+msgid "Journals"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:wizard.multi.charts.accounts:0
+msgid "Accounting Application Configuration"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Value amount: 0.02"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+#: field:account.treasury.report,starting_balance:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1332
+#, python-format
+msgid "No Partner Defined !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_period_close
+#: model:ir.actions.act_window,name:account.action_account_period_tree
+#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
+msgid "Close a Period"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,display_detail:0
+msgid "Display details"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:314
+#, python-format
+msgid "The closing balance should be the same than the computed balance!"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: selection:account.subscription,period_type:0
+#: view:analytic.entries.report:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move.lines:0
+msgid ""
+"All selected journal entries will be validated and posted. It means you "
+"won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Quantity :"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period Length (days)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
+msgid "Print Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
+msgid "Create Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_type_sales
+msgid "Report of the Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unreconciled Journal Items"
+msgstr ""
+
+#. module: account
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:839
+#, python-format
+msgid ""
+"Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. The latest line of your "
+"payment term must be of type 'balance' to avoid rounding issues."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+#: report:account.general.ledger:0
+#: field:account.installer,charts:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.act_window,name:account.action_account_chart
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "(If you do not select period it will take all open periods)"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:584
+#, python-format
+msgid "You can not create journal items on a \"view\" account %s %s"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_reconcile_process
+msgid "Reconcilation Process partner by partner"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "2"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: report:account.analytic.account.journal:0
+#: selection:account.balance.report,filter:0
+#: field:account.bank.statement,date:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,date:0
+#: field:account.move.line.reconcile.writeoff,date_p:0
+#: report:account.overdue:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.print.journal,sort_selection:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.report.general.ledger,sortby:0
+#: field:account.subscription.generate,date:0
+#: field:account.subscription.line,date:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: field:analytic.entries.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Post"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2280
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' of model '%s' is "
+"based on partner payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:837
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: selection:account.general.journal,filter:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+msgid "No Filters"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Pro-forma Invoices"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_contact_id:0
+msgid "Contact Address Name"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,reconcile:0
+msgid ""
+"Check this option if you want the user to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1153
+#, python-format
+msgid "Unable to change tax !"
+msgstr ""
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft Refund"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:921
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralised journal. Uncheck the "
+"centralised counterpart box in the related journal from the configuration "
+"menu."
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.chart.template,name:0
+#: field:account.model.line,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
+#: field:account.subscription,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:591
+#, python-format
+msgid "You can not create journal items on a closed account %s %s"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_tree
+#: model:ir.ui.menu,name:account.menu_action_bank_tree
+msgid "Setup your Bank Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr ""
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.aged.trial.balance:0
+#: constraint:account.balance.report:0
+#: constraint:account.central.journal:0
+#: constraint:account.common.account.report:0
+#: constraint:account.common.journal.report:0
+#: constraint:account.common.partner.report:0
+#: constraint:account.common.report:0
+#: constraint:account.general.journal:0
+#: constraint:account.partner.balance:0
+#: constraint:account.partner.ledger:0
+#: constraint:account.print.journal:0
+#: constraint:account.report.general.ledger:0
+#: constraint:account.vat.declaration:0
+#: constraint:accounting.report:0
+msgid ""
+"The fiscalyear, periods or chart of account chosen have to belong to the "
+"same company."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.todo.category,name:account.category_accounting_configuration
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current year"
+msgstr ""
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+msgid ""
+"Print Report with the currency column if the currency is different then the "
+"company currency"
+msgstr ""
+
+#. module: account
+#: help:account.account,unrealized_gain_loss:0
+msgid ""
+"Value of Loss or Gain due to changes in exchange rate when doing multi-"
+"currency transactions."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"entries of all fiscal years. Note that you should define it with default "
+"debit/credit accounts, of type 'situation' and with a centralized "
+"counterpart."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:wizard.multi.charts.accounts:0
+msgid "title"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid "Confirm Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: report:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
+msgid "30 Days End of Month"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
+msgid "Analytic Balance"
+msgstr ""
+
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Posted Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Search Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Day of the Month= -1"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Number of Days: 30"
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The start date of the fiscal year must be before his end date."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.account.type,name:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: selection:account.financial.report,type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Account Owner"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category using sale price"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:97
+#, python-format
+msgid ""
+"You haven't supplied enough argument to compute the initial balance, please "
+"select a period and journal in the context."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,month:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1216
+#, python-format
+msgid ""
+"You can not do this modification on a confirmed entry! You can just change "
+"some non legal fields or you must unconfirm the journal entry first! \n"
+"%s"
+msgstr ""
+
+#. module: account
+#: field:res.company,paypal_account:0
+msgid "Paypal Account"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Reverse balance sign"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:184
+#, python-format
+msgid "Balance Sheet (Liability account)"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_code_id:0
+msgid "Account Base Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:93
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Accounting Properties"
+msgstr ""
+
+#. module: account
+#: help:res.company,paypal_account:0
+msgid "Paypal username (usually email) for receiving online payments."
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:367
+#, python-format
+msgid "Statement %s is confirmed, journal items are created."
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.balance,empty_acc:0
+msgid "Check if you want to display Accounts with 0 balance too."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Compute Code"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Default taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr ""
+
+#. module: account
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
+
+#. module: account
+#: help:account.move.line,state:0
+msgid ""
+"When new move line is created the state will be 'Draft'.\n"
+"* When all the payments are done it will be in 'Valid' state."
+msgstr ""
+
+#. module: account
+#: field:account.journal,view_id:0
+msgid "Display Mode"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Statement from invoice or payment"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Main Title 1 (bold, underlined)"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.account,exchange_rate:0
+msgid "Exchange Rate"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Bank statements are entered in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_reconcile.py:133
+#, python-format
+msgid "Reconcile Writeoff"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,balance_end_cash:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#, python-format
+msgid "Not implemented"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,visible:0
+msgid "Can be Visible?"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_select
+msgid "Account Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.period:0
+msgid "The name of the period must be unique per company!"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+msgid "Unreconciliate transactions"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,visible:0
+msgid ""
+"Set this to False if you don't want this template to be used actively in the "
+"wizard that generate Chart of Accounts from templates, this is useful when "
+"you want to generate accounts of this template only when loading its child "
+"template."
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account,reconcile:0
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1077
+#, python-format
+msgid ""
+"You can not modify company of this period as some journal items exists."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Based On"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
+msgid "Account Analytic Cost Ledger For Journal Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_model_form
+#: model:ir.ui.menu,name:account.menu_action_model_form
+msgid "Recurring Models"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1251
+#, python-format
+msgid "Encoding error"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Change"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_credit_account_id:0
+msgid "It acts as a default account for credit amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Example"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:828
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3299
+#, python-format
+msgid "Purchase Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.actions.act_window,name:account.action_account_subscription_generate
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Generate Entries"
+msgstr ""
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
+#: field:account.fiscal.position.template,account_ids:0
+msgid "Account Mapping"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:337
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1567
+#, python-format
+msgid ""
+"Couldn't create move with currency different from the secondary currency of "
+"the account \"%s - %s\". Clear the secondary currency field of the account "
+"definition if you want to accept all currencies."
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement,state:0
+msgid "New"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_code_id:0
+#: field:account.tax.template,ref_tax_code_id:0
+msgid "Refund Tax Code"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+msgid ""
+"All draft account entries in this journal and period will be validated. It "
+"means you won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date1:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3120
+#, python-format
+msgid "MISC"
+msgstr ""
+
+#. module: account
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were reconciled last time"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "My invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Posted Journal Entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Supplier Refund, otherwise a "
+"Partner bank account number."
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "No"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure ?"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:923
+#, python-format
+msgid "Opening Period"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Journal Entries to Review"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:3368
+#: code:addons/account/account_move_line.py:807
+#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:835
+#: code:addons/account/account_move_line.py:837
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_report_common.py:150
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date2:0
+#: field:account.analytic.cost.ledger,date2:0
+#: field:account.analytic.cost.ledger.journal.report,date2:0
+#: field:account.analytic.inverted.balance,date2:0
+#: field:account.analytic.journal.report,date2:0
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_partner_balance
+msgid ""
+"This report is analysis by partner. It is a PDF report containing one line "
+"per partner representing the cumulative credit balance."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
+msgid ""
+"To print an analytics (or costs) journal for a given period. The report give "
+"code, move name, account number, general amount and analytic amount."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_user
+msgid "Accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_treasury_report_all
+msgid ""
+"From this view, have an analysis of your treasury. It sums the balance of "
+"every accounting entries made on liquidity accounts per period."
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Sale journal in this month"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_vat_declaration
+#: model:ir.model,name:account.model_account_vat_declaration
+msgid "Account Vat Declaration"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr ""
+
+#. module: account
+#: field:account.treasury.report,date:0
+msgid "Beginning of Period Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1351
+#, python-format
+msgid ""
+"You can not modify a posted entry of this journal !\n"
+"You should set the journal to allow cancelling entries if you want to do "
+"that."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1090
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,target_move:0
+#: field:account.balance.report,target_move:0
+#: report:account.central.journal:0
+#: field:account.central.journal,target_move:0
+#: field:account.chart,target_move:0
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.move.journal,target_move:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.tax.chart,target_move:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,target_move:0
+#: field:accounting.report,target_move:0
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_net
+#: model:account.payment.term,note:account.account_payment_term_net
+msgid "30 Net Days"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Reverse Compute Code"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_payment_term_form
+#: model:ir.ui.menu,name:account.menu_action_payment_term_form
+msgid "Payment Terms"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sale and purchase rates or choose from list of taxes. This last "
+"choice assumes that the set of tax defined on this template is complete"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: field:account.financial.report,children_ids:0
+#: model:ir.model,name:account.model_account_financial_report
+msgid "Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,year:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: field:report.account.sales,name:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1307
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.ui.menu,name:account.menu_account_report_bs
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date in Period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
+#: model:ir.actions.act_window,name:account.action_move_line_form
+msgid "Entries"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:146
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Validation"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Accounts with a past deadline."
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transaction"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Cash and Banks"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days:0
+msgid ""
+"Number of days to add before computation of the day of month.If Date=15/01, "
+"Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:project.account.analytic.line:0
+msgid "(Keep empty to open the current situation)"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date1:0
+#: field:account.analytic.cost.ledger,date1:0
+#: field:account.analytic.cost.ledger.journal.report,date1:0
+#: field:account.analytic.inverted.balance,date1:0
+#: field:account.analytic.journal.report,date1:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_account_report
+msgid "Account Common Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+#: field:account.invoice,reference:0
+msgid "Communication"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include Initial Balances"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Number of Days: 14"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3446
+#: code:addons/account/account_bank_statement.py:338
+#: code:addons/account/account_invoice.py:427
+#: code:addons/account/account_invoice.py:527
+#: code:addons/account/account_invoice.py:542
+#: code:addons/account/account_invoice.py:550
+#: code:addons/account/account_invoice.py:572
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Amount To Pay"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+msgid ""
+"This is the remaining partners for who you should check if there is "
+"something to reconcile or not. This figure already count the current partner "
+"as reconciled."
+msgstr ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+#: model:ir.actions.act_window,name:account.action_account_change_currency
+#: model:ir.model,name:account.model_account_change_currency
+msgid "Change Currency"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "This action will erase taxes"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+#: field:account.entries.report,amount_currency:0
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+msgid ""
+"Specified Journal does not have any account move entries in draft state for "
+"this period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_move_line
+msgid "Lines to reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries during last 7 days"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Normal Text"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice Options"
+msgstr ""
+
+#. module: account
+#: help:account.automatic.reconcile,power:0
+msgid ""
+"Number of partial amounts that can be combined to find a balance point can "
+"be chosen as the power of the automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,sequence:0
+msgid ""
+"The sequence field is used to order the payment term lines from the lowest "
+"sequences to the higher ones"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid ""
+"If no additional entries should be recorded on a fiscal year, you can close "
+"it from here. It will close all opened periods in this year that will make "
+"impossible any new entry record. Close a fiscal year when you need to "
+"finalize your end of year results definitive "
+msgstr ""
+
+#. module: account
+#: field:account.central.journal,amount_currency:0
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Automatic formatting"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:963
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one from the configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Valid Up to"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_journal
+msgid "Move journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close
+msgid "Generate Opening Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:759
+#, python-format
+msgid "Already Reconciled!"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due Date Computation"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
+#: model:ir.ui.menu,name:account.account_def_analytic_journal
+msgid "Analytic Journals"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1214
+#, python-format
+msgid "Move name (id): %s (%s)"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:857
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_income
+#: model:account.financial.report,name:account.account_financial_report_income0
+msgid "Income"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:339
+#, python-format
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+msgid "VAT"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:88
+#, python-format
+msgid "Free Reference"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value:0
+msgid "Valuation"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:301
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_state_open
+#: model:ir.model,name:account.model_account_state_open
+msgid "Account State Open"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid ""
+"The tax code definition depends on the tax declaration of your country. "
+"OpenERP allows you to define the tax structure and manage it from this menu. "
+"You can define both numeric and alphanumeric tax codes."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,progress:0
+msgid ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value:0
+msgid ""
+"Select here the kind of valuation related to this payment term line. Note "
+"that you should have your last line with the type 'Balance' to ensure that "
+"the whole amount will be threated."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.common.account.report,filter:0
+#: field:account.common.journal.report,filter:0
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.vat.declaration,filter:0
+#: field:accounting.report,filter:0
+#: field:accounting.report,filter_cmp:0
+msgid "Filter by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2256
+#, python-format
+msgid "You have a wrong expression \"%(...)s\" in your model !"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,date:0
+msgid "Entry Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:830
+#, python-format
+msgid "Entries are not of the same account or already reconciled ! "
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Balance as calculated based on Starting Balance and transaction lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not configured properly !"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_general_journal
+#: model:ir.model,name:account.model_account_general_journal
+msgid "Account General Journal"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
+msgid "Review your Financial Journals"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "  365 Days  "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
+msgid "Customer Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.account,foreign_balance:0
+msgid "Foreign Balance"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+msgid "Multipication factor for Base code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:150
+#, python-format
+msgid "not implemented"
+msgstr ""
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
+"Forma' state!"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Running Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_analytic_entries_report
+#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
+msgid "Analytic Entries Analysis"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,journal_id:0
+msgid ""
+"This journal will be created automatically for this bank account when you "
+"save the record"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid ""
+"This view can be used by accountants in order to quickly record entries in "
+"OpenERP. If you want to record a supplier invoice, start by recording the "
+"line of the expense account. OpenERP will propose to you automatically the "
+"Tax related to this account and the counterpart \"Account Payable\"."
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_created:0
+msgid "Date Created"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax_rate:0
+msgid "Sales Tax(%)"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_template_form
+msgid "Account Templates"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sales and purchase rates or use the usual m2o fields. This last "
+"choice assumes that the set of tax defined for the chosen template is "
+"complete"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Open and Paid Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children flat"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:629
+#, python-format
+msgid ""
+"You can not remove/desactivate an account which is set on a customer or "
+"supplier."
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close.state,fy_id:0
+msgid "Select a fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,tax_template_ids:0
+msgid "List of all the taxes that have to be installed by the wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr ""
+
+#. module: account
+#: field:account.chart,fiscalyear:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.automatic.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice:0
+#: view:account.invoice.refund:0
+#: view:account.journal.select:0
+#: view:account.move:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.partner.reconcile.process:0
+#: view:account.period.close:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: code:addons/account/wizard/account_move_journal.py:105
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_receivable
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_credit_account_id:0
+msgid "Default Credit Account"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3368
+#, python-format
+msgid "Cannot generate an unused journal code."
+msgstr ""
+
+#. module: account
+#: view:project.account.analytic.line:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicates if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
+msgid "Inverted Analytic Balance"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"higher ones. The order is important if you have a tax that has several tax "
+"children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: view:account.journal:0
+msgid "Liquidity"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
+#: model:ir.ui.menu,name:account.account_analytic_journal_entries
+msgid "Analytic Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid ""
+"This wizard will generate the end of year journal entries of selected fiscal "
+"year. Note that you can run this wizard many times for the same fiscal year: "
+"it will simply replace the old opening entries with the new ones."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
+msgid "Bank and Cash"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:664
+#, python-format
+msgid ""
+"You cannot change the owner company of an account that already contains "
+"journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "Enter a Start date !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_dashboard_acc
+msgid "Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.financial.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Valuation: Balance"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: constraint:account.payment.term.line:0
+msgid ""
+"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
+"2% "
+msgstr ""
+
+#. module: account
+#: field:account.installer,has_default_company:0
+msgid "Has Default Company"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.model,name:account.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:622
+#, python-format
+msgid "You can not desactivate an account that contains some journal items."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: field:account.fiscal.position.template,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:624
+#, python-format
+msgid "You can not remove an account containing journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:145
+#: code:addons/account/account_move_line.py:933
+#, python-format
+msgid "Entries: "
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create manual recurring entries in a chosen journal."
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,currency_id:0
+msgid "Currency of the related account journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1563
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"An account type is used to determine how an account is used in each journal. "
+"The deferral method of an account type determines the process for the annual "
+"closing. Reports such as the Balance Sheet and the Profit and Loss report "
+"use the category (profit/loss or balance sheet). For example, the account "
+"type could be linked to an asset account, expense account or payable "
+"account. From this view, you can create and manage the account types you "
+"need for your company."
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:183
+#, python-format
+msgid "Balance Sheet (Asset account)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
+msgid ""
+"Bank Reconciliation consists of verifying that your bank statement "
+"corresponds with the entries (or records) of that account in your accounting "
+"system."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "State is draft"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1043
+#, python-format
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:808
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid ""
+"This will automatically configure your chart of accounts, bank accounts, "
+"taxes and journals according to the selected template"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current period"
+msgstr ""
+
+#. module: account
+#: help:account.journal,update_posted:0
+msgid ""
+"Check this box if you want to allow the cancellation the entries related to "
+"this journal or of the invoice related to this journal"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:182
+#, python-format
+msgid "Profit & Loss (Expense account)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:622
+#: code:addons/account/account.py:624
+#: code:addons/account/account.py:963
+#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1344
+#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2596
+#: code:addons/account/account_analytic_line.py:92
+#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account_bank_statement.py:301
+#: code:addons/account/account_bank_statement.py:314
+#: code:addons/account/account_bank_statement.py:352
+#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#: code:addons/account/wizard/account_invoice_refund.py:110
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,style_overwrite:0
+msgid "Financial Report Style"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Preserve balance sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+#: model:ir.actions.report.xml,name:account.account_vat_declaration
+#: model:ir.ui.menu,name:account.menu_account_vat_declaration
+msgid "Taxes Report"
+msgstr ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:591
+#, python-format
+msgid "Error :"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"reconcile in a series of accounts. It finds entries for each partner where "
+"the amounts correspond."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,to_check:0
+msgid "To Review"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"If you selected to filter by date or period, this field allow you to add a "
+"row to display the amount of debit/credit/balance that precedes the filter "
+"you've set."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Journal Entries"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,page_split:0
+msgid "Display Ledger Report with One partner per page"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1218
+#, python-format
+msgid ""
+"You can not do this modification on a reconciled entry! You can just change "
+"some non legal fields or you must unreconcile first!\n"
+"%s"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid ""
+"This report is an analysis done by a partner. It is a PDF report containing "
+"one line per partner representing the cumulative credit balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid ""
+"Selected Entry Lines does not have any account move enties in draft state"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:67
+#, python-format
+msgid "All Entries"
+msgstr ""
+
+#. module: account
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:420
+#: code:addons/account/account.py:432
+#, python-format
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.report.general.ledger:0
+#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
+#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
+#: model:ir.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+msgid "The payment order is sent to the bank."
+msgstr ""
+
+#. module: account
+#: view:account.balance.report:0
+msgid ""
+"This report allows you to print or generate a pdf of your trial balance "
+"allowing you to quickly check the balance of each of your accounts in a "
+"single report"
+msgstr ""
+
+#. module: account
+#: help:account.move,to_check:0
+msgid ""
+"Check this box if you are unsure of that journal entry and if you want to "
+"note it as 'to be reviewed' by an accounting expert."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,complete_tax_set:0
+#: field:wizard.multi.charts.accounts,complete_tax_set:0
+msgid "Complete Set of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2229
+#, python-format
+msgid ""
+"You can specify year, month and date in the name of the model using the "
+"following labels:\n"
+"\n"
+"%(year)s: To Specify Year \n"
+"%(month)s: To Specify Month \n"
+"%(date)s: Current Date\n"
+"\n"
+"e.g. My model on %(date)s"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: help:report.invoice.created,origin:0
+msgid "Reference of the document that generated this invoice report."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Sales"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:495
+#: code:addons/account/wizard/account_invoice_refund.py:145
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree1
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr ""
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"Configure your company's bank account and select those that must appear on "
+"the report footer. You can reorder banks in the list view. If you use the "
+"accounting application of OpenERP, journals and accounts will be created "
+"automatically based on these data."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "A statement with manual entries becomes a draft statement."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:report.invoice.created,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1432
+#, python-format
+msgid "You can not delete a posted journal entry \"%s\"!"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:59
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_accounting_report
+msgid "Accounting Report"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: help:account.tax,amount:0
+msgid "For taxes of type percentage, enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"A recurring entry is a miscellaneous entry that occurs on a recurrent basis "
+"from a specific date, i.e. corresponding to the signature of a contract or "
+"an agreement with a customer or a supplier. With Define Recurring Entries, "
+"you can create such entries to automate the postings in the system."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
+msgid "Financial Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,product_uom_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_uom_id:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"A Cash Register allows you to manage cash entries in your cash journals. "
+"This feature provides an easy way to follow up cash payments on a daily "
+"basis. You can enter the coins that are in your cash box, and then post "
+"entries when money comes in or goes out of the cash box."
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,date:0
+msgid ""
+"This date will be used as the invoice date for Refund Invoice and Period "
+"will be chosen accordingly!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:528
+#: code:addons/account/account_invoice.py:543
+#, python-format
+msgid ""
+"Can not find a chart of account, you should create one from the "
+"configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_opening:0
+msgid "Opening Entries Expense Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:999
+#, python-format
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Install your Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_debit_account_id:0
+msgid "It acts as a default account for debit amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
+msgid ""
+"You can search for individual account entries through useful information. To "
+"search for account entries, open a journal, then select a record line."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Posted entries"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For percent enter a ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice,date_invoice:0
+#: field:report.invoice.created,date_invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by year of Invoice Date"
+msgstr ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.use.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,closing_date:0
+msgid "Closed On"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date2:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_opening:0
+msgid "Opening Entries Income Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1088
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
+msgid "Review your Payment Terms"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Information About the Bank"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:842
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_analytic_open
+msgid "Contracts/Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:res.partner.bank,journal_id:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"This field shows you the next partner that will be automatically chosen by "
+"the system to go through the reconciliation process, based on the latest day "
+"it have been reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:429
+#, python-format
+msgid "Unable to adapt the initial balance (negative value)!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a supplier invoice, start by recording the "
+"line of the expense account, OpenERP will propose to you automatically the "
+"Tax related to this account and the counter-part \"Account Payable\"."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
+#: model:ir.model,name:account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#, python-format
+msgid "The periods to generate opening entries were not found"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_view
+msgid "Root/View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3121
+#, python-format
+msgid "OPEJ"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_email_templates
+#: model:ir.ui.menu,name:account.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+msgid ":"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_multi_currency
+msgid "Multi-Currencies"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1302
+#, python-format
+msgid "Bad account !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3108
+#, python-format
+msgid "Sales Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:104
+#, python-format
+msgid "Open Journal Items !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "No piece number !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
+msgid "Account Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,chart_template_id:0
+msgid ""
+"This optional field allow you to link an account template to a specific "
+"chart template that may differ from the one its root parent belongs to. This "
+"allow you to define chart templates that extend another and complete it with "
+"few new accounts (You don't need to define the whole structure that is "
+"common to both several times)."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Unposted Journal Entries"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+#: code:addons/account/account.py:1518
+#, python-format
+msgid "Currency Adjustment"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy_id:0
+#: field:account.fiscalyear.close.state,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
+msgid "Cancel Selected Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"This field is used to generate legal reports: profit and loss, balance sheet."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
+msgid ""
+"Payment terms define the conditions to pay a customer or supplier invoice in "
+"one or several payments. Customers periodic reminders will use the payment "
+"terms for each letter. Each customer or supplier can be assigned to one of "
+"these payment terms."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:299
+#, python-format
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:732
+#, python-format
+msgid "Global taxes defined, but they are not in invoice lines !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+msgid "Post Journal Entries of a Journal"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,name:0
+msgid "Report Name"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_cash
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.accounts.wizard,account_type:0
+#: selection:account.entries.report,type:0
+#: selection:account.journal,type:0
+#: code:addons/account/account.py:3003
+#, python-format
+msgid "Cash"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_dest_id:0
+#: field:account.fiscal.position.account.template,account_dest_id:0
+msgid "Account Destination"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1431
+#: code:addons/account/account.py:1460
+#: code:addons/account/account.py:1467
+#: code:addons/account/account_invoice.py:920
+#: code:addons/account/account_move_line.py:1104
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:83
+#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.financial.report,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: view:account.journal:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.code,sequence:0
+#: field:account.tax.template,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries."
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Parent Report"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+msgid ""
+"Here you can customize an existing journal view or create a new view. "
+"Journal views determine the way you can record entries in your journal. "
+"Select the fields you want to appear in a journal and determine the sequence "
+"in which they will appear. Then you can create a new journal and link your "
+"view to it."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "    7 Days    "
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end:0
+msgid "Computed Balance"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+#: field:account.financial.report,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"Day of the month, set -1 for the last day of the current month. If it's "
+"positive, it gives the day of the next month. Set 0 for net days (otherwise "
+"it's based on the beginning of the month)."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Reports"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"to the higher ones. The order is important if you have a tax with several "
+"tax children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: account
+#: view:account.partner.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
+#: model:ir.ui.menu,name:account.menu_account_partner_ledger
+msgid "Partner Ledger"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:629
+#: code:addons/account/account.py:642
+#: code:addons/account/account.py:645
+#: code:addons/account/account.py:664
+#: code:addons/account/account.py:787
+#: code:addons/account/account.py:1077
+#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_move_line.py:97
+#: code:addons/account/account_move_line.py:750
+#: code:addons/account/account_move_line.py:803
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile
+msgid "Account move line reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.change.currency,currency_id:0
+msgid "Select a currency to apply on the invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3446
+#, python-format
+msgid ""
+"The bank account defined on the selected chart of accounts hasn't a code."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:810
+#, python-format
+msgid "No Invoice Lines !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report Type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "State"
+msgstr ""
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+msgid ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:315
+#, python-format
+msgid ""
+"The statement balance is incorrect !\n"
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:353
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"The normal chart of accounts has a structure defined by the legal "
+"requirement of the country. The analytic chart of accounts structure should "
+"reflect your own business needs in term of costs/revenues reporting. They "
+"are usually structured by contracts, projects, products or departements. "
+"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
+"generate analytic entries on the related account."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:379
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr ""
+
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this box if this account allows reconciliation of journal items."
+msgstr ""
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The state is 'Draft'. At the end of "
+"monthly period it is in 'Done' state."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "This Months Sales by type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1332
+#, python-format
+msgid "You must first select a partner !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"Invoice.             \n"
+"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have "
+"an invoice number.             \n"
+"* The 'Open' state is used when user create invoice,a invoice number is "
+"generated.Its in open state till user does not pay invoice.             \n"
+"* The 'Paid' state is set automatically when the invoice is paid. Its "
+"related journal entries may or may not be reconciled.             \n"
+"* The 'Cancelled' state is used when user cancel invoice."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,residual:0
+msgid "Total Residual"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_invoiceinvoice0
+#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
+msgid "Invoice's state is Open"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"will see the taxes with codes related to your legal statement according to "
+"your country."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:428
+#, python-format
+msgid ""
+"Can not find a chart of accounts for this company, you should create one."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3111
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by Invoice Date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Modify Invoice: Cancels the current invoice and creates a new copy of it "
+"ready for editing."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,period_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: view:account.period:0
+#: field:account.subscription,period_nbr:0
+#: field:account.tax.chart,period_id:0
+#: field:account.treasury.report,period_id:0
+#: field:validate.account.move,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account
+#: help:account.account,adjusted_balance:0
+msgid ""
+"Total amount (in Company currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for the current "
+"partner"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1030
+#, python-format
+msgid ""
+"You can not cancel an invoice which is partially paid! You need to "
+"unreconcile related payment entries first!"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr ""
+
+#. module: account
+#: field:account.account,adjusted_balance:0
+msgid "Adjusted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
+msgid "Fiscal Position Templates"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Valuation: Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"With Customer Refunds you can manage the credit notes for your customers. A "
+"refund is a document that credits an invoice completely or partially. You "
+"can easily generate refunds and reconcile them directly from the invoice "
+"form."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_vat_declaration
+msgid ""
+"This menu print a VAT declaration based on invoices or payments. You can "
+"select one or several periods of the fiscal year. Information required for a "
+"tax declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+#: field:accounting.report,chart_account_id:0
+msgid "Chart of Account"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end_real:0
+#: field:account.treasury.report,ending_balance:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: view:account.move.line.reconcile:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "current month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1052
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create one."
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "Automatic import of the bank sta"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_journal_view
+#: model:ir.ui.menu,name:account.menu_action_account_journal_view
+msgid "Journal Views"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_type_ids:0
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Value amount: n.a"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid ""
+"This button only appears when the state of the invoice is 'paid' (showing "
+"that it has been fully reconciled) and auto-computed boolean 'reconciled' is "
+"False (depicting that it's not the case anymore). In other words, the "
+"invoice has been dereconciled and it does not fit anymore the 'paid' state. "
+"You should press this button to re-open it and let it continue its normal "
+"process after having resolved the eventual exceptions it may have created."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+msgid "Filter By"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"With Customer Invoices you can create and manage sales invoices issued to "
+"your customers. OpenERP can also generate draft invoices automatically from "
+"sales orders or deliveries. You should only confirm them before sending them "
+"to your customers."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid ""
+"In order to close a period, you must first post related journal entries."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3296
+#, python-format
+msgid "Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Contacts"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,parent_id:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3109
+#, python-format
+msgid "Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice: Creates the refund invoice, ready for editing."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_supplier
+#: model:ir.ui.menu,name:account.menu_finance_payables
+msgid "Suppliers"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in the company currency."
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:495
+#, python-format
+msgid "The payment term of supplier does not have a payment term line!"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_treasory_graph
+msgid "Treasury"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.common.report:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft Customer Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic Costs"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+#: report:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Smallest Text"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_invoice
+msgid "Invoicing & Payments"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,internal_number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_expense
+#: model:account.financial.report,name:account.account_financial_report_expense0
+msgid "Expense"
+msgstr ""
+
+#. module: account
+#: help:account.chart,fiscalyear:0
+msgid "Keep empty for all open fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1105
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1307
+#, python-format
+msgid ""
+"You can not validate a non-balanced entry !\n"
+"Make sure you have configured payment terms properly !\n"
+"The latest payment term line should be of the type \"Balance\" !"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+#: field:res.partner.bank,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of bank statement lines."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Accountant validates the accounting entries coming from the invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
+msgid ""
+"Define your company's financial year according to your needs. A financial "
+"year is a period at the end of which a company's accounts are made up "
+"(usually 12 months). The financial year is usually referred to by the date "
+"in which it ends. For example, if a company's financial year ends November "
+"30, 2011, then everything between December 1, 2010 and November 30, 2011  "
+"would be referred to as FY 2011. You are not obliged to follow the actual "
+"calendar year."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2256
+#, python-format
+msgid "Wrong model !"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,sign:0
+msgid ""
+"For accounts that are typically more debited than credited and that you "
+"would like to print as negative amounts in your reports, you should reverse "
+"the sign of the balance; e.g.: Expense account. The same applies for "
+"accounts that are typically more credited than debited and that you would "
+"like to print as positive amounts in your reports; e.g.: Income account."
+msgstr ""
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,ending_id:0
+#: field:account.cashbox.line,starting_id:0
+#: field:account.entries.report,reconcile_id:0
+#: field:account.financial.report,balance:0
+msgid "unknown"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+#: code:addons/account/account.py:3113
+#, python-format
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+msgid "Draft invoices are checked, validated and printed."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,property_reserve_and_surplus_account:0
+msgid ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss: Amount will be deducted.), Which is calculated from "
+"Profilt & Loss Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:808
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.move.line:0
+#: field:account.move.line,narration:0
+msgid "Internal Note"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This year's Sales by type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Given by Python Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.move.line,amount_residual:0
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
+msgid "Review your Financial Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_open_journal_button
+#: model:ir.actions.act_window,name:account.action_validate_account_move
+msgid "Open Journal"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period from"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3110
+#, python-format
+msgid "Sales Refund Journal"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.payment.term:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
+msgid "Purchase Tax(%)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:810
+#, python-format
+msgid "Please create some invoice lines."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,display_detail:0
+msgid "Display Detail"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3118
+#, python-format
+msgid "SCNJ"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft invoices."
+msgstr ""
+
+#. module: account
+#: help:account.journal,view_id:0
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP which fields should be visible, required or readonly and "
+"in which order. You can create your own view for a faster encoding in each "
+"journal."
+msgstr ""
+
+#. module: account
+#: field:account.period,date_stop:0
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,financial_report_ids:0
+#: field:account.account.template,financial_report_ids:0
+#: model:ir.actions.act_window,name:account.action_account_financial_report_tree
+#: model:ir.actions.act_window,name:account.action_account_report
+#: model:ir.actions.act_window,name:account.action_account_report_bs
+#: model:ir.actions.act_window,name:account.action_account_report_pl
+#: model:ir.ui.menu,name:account.menu_account_reports
+msgid "Financial Reports"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_from:0
+#: field:account.balance.report,period_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_from:0
+#: field:account.common.account.report,period_from:0
+#: field:account.common.journal.report,period_from:0
+#: field:account.common.partner.report,period_from:0
+#: field:account.common.report,period_from:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_from:0
+#: field:accounting.report,period_from:0
+#: field:accounting.report,period_from_cmp:0
+msgid "Start Period"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1046
+#, python-format
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Best regards."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
+#. module: account
+#: field:account.account,balance:0
+#: report:account.account.balance:0
+#: selection:account.account.type,close_method:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,balance:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,residual:0
+#: field:account.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,balance:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Manually or automatically entered in the system"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+msgid "Display Account"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+msgid "Closing Method"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_payable
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "This Year"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"the income account. OpenERP will propose to you automatically the Tax "
+"related to this account and the counter-part \"Account receivable\"."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid ""
+"Here you can define a financial period, an interval of time in your "
+"company's financial year. An accounting period typically is a month or a "
+"quarter. It usually corresponds to the periods of the tax declaration. "
+"Create and manage periods from here and decide whether a period should be "
+"closed or left open depending on your company's activities over a specific "
+"period."
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Filters By"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.move.line,move_id:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1153
+#, python-format
+msgid "You can not change the tax, you should remove and recreate lines !"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 365 days"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: help:account.addtmpl.wizard,cparent_id:0
+msgid ""
+"Creates an account with the selected template under this existing parent."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconciliation transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#, python-format
+msgid ""
+"The journal must have centralised counterpart without the Skipping draft "
+"state option checked!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment entries"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:412
+#, python-format
+msgid ""
+"No opening/closing period defined, please create one to set the initial "
+"balance!"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_to:0
+#: field:account.balance.report,period_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_to:0
+#: field:account.common.account.report,period_to:0
+#: field:account.common.journal.report,period_to:0
+#: field:account.common.partner.report,period_to:0
+#: field:account.common.report,period_to:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_to:0
+#: field:accounting.report,period_to:0
+#: field:accounting.report,period_to_cmp:0
+msgid "End Period"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr ""
+
+#. module: account
+#: view:account.move.journal:0
+msgid "Standard entries"
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for customer invoices journals. Select 'Purchase' for supplier "
+"invoices journals. Select 'Cash' or 'Bank' for journals that are used in "
+"customer or supplier payments. Select 'General' for miscellaneous operations "
+"journals. Select 'Opening/Closing Situation' for entries generated for new "
+"fiscal years."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from:0
+#: field:account.balance.report,date_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_from:0
+#: field:account.common.account.report,date_from:0
+#: field:account.common.journal.report,date_from:0
+#: field:account.common.partner.report,date_from:0
+#: field:account.common.report,date_from:0
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_start:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.subscription,date_start:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_from:0
+#: field:accounting.report,date_from:0
+#: field:accounting.report,date_from_cmp:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"It indicates that the invoice has been paid and the journal entry of the "
+"invoice has been reconciled with one or several journal entries of payment."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:828
+#, python-format
+msgid "Bad total !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"open period. Close a period when you do not want to record new entries and "
+"want to lock this period for tax related calculation."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.fiscal.position,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: view:accounting.report:0
+msgid "Comparison"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:372
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_id:0
+#: field:account.account.template,currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+msgid "Secondary Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr ""
+
+#. module: account
+#: field:account.account,credit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,credit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,credit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+msgid ""
+"You can select here the journal to use for the refund invoice that will be "
+"created. If you leave that field empty, it will use the same journal as the "
+"current invoice."
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:181
+#, python-format
+msgid "Profit & Loss (Income account)"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,number:0
+#: field:account.invoice,number:0
+#: field:account.move,name:0
+msgid "Number"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 30 days"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: view:account.chart:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: view:account.print.journal:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: report:account.vat.declaration:0
+#: view:account.vat.declaration:0
+#: selection:account.vat.declaration,filter:0
+#: view:accounting.report:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: model:ir.actions.act_window,name:account.action_account_period_form
+#: model:ir.ui.menu,name:account.menu_action_account_period_form
+#: model:ir.ui.menu,name:account.next_id_23
+msgid "Periods"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
+msgid "Profit (Loss) to report"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund invoice base on this type. You can not Modify and Cancel if the "
+"invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 2 (bold)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+msgid ""
+"The validation of journal entries process is also called 'ledger posting' "
+"and is the process of transferring debit and credit amounts from a journal "
+"of original entry to a ledger book."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,state:0
+msgid ""
+"When new statement is created the state will be 'Draft'.\n"
+"And after getting confirmation from the bank it will be in 'Confirmed' state."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr ""
+
+#. module: account
+#: view:account.report.general.ledger:0
+msgid ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Regular"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "This Month"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Posted"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_to:0
+#: field:account.balance.report,date_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_to:0
+#: field:account.common.account.report,date_to:0
+#: field:account.common.journal.report,date_to:0
+#: field:account.common.partner.report,date_to:0
+#: field:account.common.report,date_to:0
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_stop:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_to:0
+#: field:accounting.report,date_to:0
+#: field:accounting.report,date_to_cmp:0
+msgid "End Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_src_id:0
+#: field:account.fiscal.position.tax.template,tax_src_id:0
+msgid "Tax Source"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "No detail"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:102
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account
+#: field:account.account,unrealized_gain_loss:0
+#: model:ir.actions.act_window,name:account.action_account_gain_loss
+#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
+msgid "Unrealized Gain or Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.period:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
+msgid "Auto-email confirmed invoices"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,check_total:0
+msgid "Verification Total"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: field:account.invoice,amount_total:0
+#: field:report.account.sales,amount_total:0
+#: field:report.account_type.sales,amount_total:0
+#: field:report.invoice.created,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:97
+#, python-format
+msgid "Journal: All"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: field:account.aged.trial.balance,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.balance.report,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,company_id:0
+#: field:account.central.journal,company_id:0
+#: field:account.common.account.report,company_id:0
+#: field:account.common.journal.report,company_id:0
+#: field:account.common.partner.report,company_id:0
+#: field:account.common.report,company_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,company_id:0
+#: field:account.fiscal.position,company_id:0
+#: field:account.fiscalyear,company_id:0
+#: field:account.general.journal,company_id:0
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: view:account.journal:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.partner.balance,company_id:0
+#: field:account.partner.ledger,company_id:0
+#: field:account.period,company_id:0
+#: field:account.print.journal,company_id:0
+#: field:account.report.general.ledger,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
+#: field:account.treasury.report,company_id:0
+#: field:account.vat.declaration,company_id:0
+#: field:accounting.report,company_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,company_id:0
+#: field:wizard.multi.charts.accounts,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid ""
+"Manual or automatic creation of payment entries according to the statements"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category using cost price"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer as well as payment delays. The tool search can also be used to "
+"personalise your Invoices reports and so, match this analysis to your needs."
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_sales
+msgid "Report of the Sales by Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,debit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,debit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,debit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 3 (bold, smaller)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Journal Entry Number"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:642
+#, python-format
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains journal items!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry is already reconciled"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a purchase journal."
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+msgid ""
+"The 'Internal Type' is used for features available on different types of "
+"accounts: view can not have journal items, consolidation are accounts that "
+"can have children accounts for multi-company consolidations, "
+"payable/receivable are for partners accounts (for debit/credit "
+"computations), closed for depreciated accounts."
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With movements"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
+#: model:ir.ui.menu,name:account.account_analytic_journal_print
+msgid "Print Analytic Journals"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by month of Invoice Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:165
+#, python-format
+msgid "This period is already closed !"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoiceimport0
+msgid ""
+"Import of the statement in the system from a supplier or customer invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
+msgid "Billing"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.analytic.account:0
+msgid "Parent Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"Create and manage your company's journals from this menu. A journal is used "
+"to record transactions of all accounting data related to the day-to-day "
+"business of your company using double-entry bookkeeping system. Depending on "
+"the nature of its activities and the number of daily transactions, a company "
+"may keep several types of specialized journals such as a cash journal, "
+"purchase journal, sales journal..."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description On Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+#, python-format
+msgid "Bad account!"
+msgstr ""
+
+#. module: account
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted by"
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entries are usually in the state "
+"'Unposted', but you can set the option to skip that state on the related "
+"journal. In that case, they will be behave as journal entries automatically "
+"created by the system on document validation (invoices, bank statements...) "
+"and will be created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:364
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: refund invoice, reconcile and create a new draft invoice"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.refund:0
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_refund
+msgid "Refund"
+msgstr ""
+
+#. module: account
+#: model:email.template,body_text:account.email_template_edi_invoice
+msgid ""
+"\n"
+"Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"A new invoice is available for ${object.partner_id.name}:\n"
+"       | Invoice number: *${object.number}*\n"
+"       | Invoice total: *${object.amount_total} ${object.currency_id.name}*\n"
+"       | Invoice date: ${object.date_invoice}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the invoice document, download it and pay online using the "
+"following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+"             "
+"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
+#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
+msgid "Cost Ledger (Only quantities)"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_reconcilepaid0
+msgid "As soon as the reconciliation is done, the invoice can be paid."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Search Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
+msgid "Fiscal Years"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_central_journal
+#: model:ir.model,name:account.model_account_central_journal
+msgid "Account Central Journal"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: help:account.tax.template,ref_tax_sign:0
+#: help:account.tax.template,tax_sign:0
+msgid "Usually 1 or -1."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:accounting.report,label_filter:0
+msgid ""
+"This label will be displayed on report to show the balance computed for the "
+"given comparison filter."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#, python-format
+msgid "You must enter a period length that cannot be 0 or below !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid ""
+"Create and manage the accounts you need to record journal entries. An "
+"account is part of a ledger allowing your company to register all kinds of "
+"debit and credit transactions. Companies present their annual accounts in "
+"two main parts: the balance sheet and the income statement (profit and loss "
+"account). The annual accounts of a company are required by law to disclose a "
+"certain amount of information. They have to be certified by an external "
+"auditor annually."
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual_currency:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in its currency (maybe different of the company currency)."
+msgstr ""
diff --git a/addons/account_analytic_analysis/i18n/ja.po b/addons/account_analytic_analysis/i18n/ja.po
index 714b1eee4c4..9ed8acf0a61 100644
--- a/addons/account_analytic_analysis/i18n/ja.po
+++ b/addons/account_analytic_analysis/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-13 23:04+0000\n"
+"PO-Revision-Date: 2012-04-16 17:38+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-15 04:42+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
@@ -59,7 +59,7 @@ msgstr "１ヶ月以内に期限を迎える分析アカウント"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
diff --git a/addons/account_analytic_default/i18n/gu.po b/addons/account_analytic_default/i18n/gu.po
new file mode 100644
index 00000000000..fd0d2450737
--- /dev/null
+++ b/addons/account_analytic_default/i18n/gu.po
@@ -0,0 +1,183 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-16 11:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"select a partner which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Current"
+msgstr "વર્તમાન"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Group By..."
+msgstr "ગ્રુપ દ્વારા..."
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "શરતો"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"select a company which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"company, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "ઉત્પાદન"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "કંપની"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "અંતિમ તારીખ"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"select a user which will use analytical account specified in analytic default"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
+msgid "Analytic Defaults"
+msgstr ""
+
+#. module: account_analytic_default
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Analytical defaults whose end date is greater than today or None"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"select a product which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"product, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "ક્રમ"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "વિશ્લેષણાત્મક ખાતું"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr "ખાતાઓ"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr "ભાગીદાર"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr "શરુઆતની તારીખ"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of analytic distribution"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
diff --git a/addons/account_analytic_default/i18n/ja.po b/addons/account_analytic_default/i18n/ja.po
index af4c1f3ae55..7e109b403a7 100644
--- a/addons/account_analytic_default/i18n/ja.po
+++ b/addons/account_analytic_default/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-13 22:29+0000\n"
+"PO-Revision-Date: 2012-04-16 17:39+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-14 04:57+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -47,7 +47,7 @@ msgstr "現在"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
diff --git a/addons/account_analytic_plans/i18n/gu.po b/addons/account_analytic_plans/i18n/gu.po
new file mode 100644
index 00000000000..54f3635ee07
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/gu.po
@@ -0,0 +1,542 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-16 12:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+msgid "Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "બરાબર"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "કિંમત"
+
+#. module: account_analytic_plans
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid "Define your Analytic Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "છાપો"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
+msgid "Percentage"
+msgstr "ટકાવારી"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+msgid "Analytic Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr "ચલણ"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "શરુઆતની તારીખ"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error"
+msgstr "ભૂલ"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "જથ્થો"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "વિશ્લેષણાત્મક ખાતું"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr "બિલ"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "એટ"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "ખાતા નામ"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,help:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid ""
+"To setup a multiple analytic plans environment, you must define the root "
+"analytic accounts for each plan set. Then, you must attach a plan set to "
+"your account journals."
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "Value Error"
+msgstr ""
diff --git a/addons/account_anglo_saxon/i18n/gu.po b/addons/account_anglo_saxon/i18n/gu.po
new file mode 100644
index 00000000000..ae11c66152d
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/gu.po
@@ -0,0 +1,98 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-16 11:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "ઉત્પાદન વર્ગ"
+
+#. module: account_anglo_saxon
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "ખરીદી ઓર્ડર"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "બિલ"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_anglo_saxon/i18n/ja.po b/addons/account_anglo_saxon/i18n/ja.po
index 63df6b6ff2f..d761b8823c2 100644
--- a/addons/account_anglo_saxon/i18n/ja.po
+++ b/addons/account_anglo_saxon/i18n/ja.po
@@ -8,39 +8,39 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-01 05:17+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-04-16 17:44+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-02 04:37+0000\n"
-"X-Generator: Launchpad (build 15032)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "発注参照は会社ごとにユニークなければいけません"
+msgstr "オーダー参照は会社ごとにユニークでなければいけません。"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
 msgid " Accounting Property"
-msgstr " 経理属性"
+msgstr " 会計の属性"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr "製品カテゴリー"
+msgstr "製品分類"
 
 #. module: account_anglo_saxon
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr "参照は会社ごとにユニークでなければいけません"
+msgstr "参照は会社ごとにユニークでなければいけません。"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr "エラー：再帰カテゴリーを作成することはできません"
+msgstr "エラー：再帰カテゴリーを作成することはできません。"
 
 #. module: account_anglo_saxon
 #: constraint:account.invoice:0
@@ -51,17 +51,17 @@ msgstr "無効なBBA構造のコミュニケーション"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "エラー：デフォールトのUOMと購入UOMは同じカテゴリーでなければいけません"
+msgstr "エラー：デフォルトのUOMと発注UOMは同じ分類でなければいけません。"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "請求明細"
+msgstr "請求行"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr "購買発注"
+msgstr "発注オーダー"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
@@ -82,12 +82,12 @@ msgstr "請求書"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr "選択リスト"
+msgstr "集荷リスト"
 
 #. module: account_anglo_saxon
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "請求書番号は会社ごとにユニークでなければいけません"
+msgstr "請求書番号は会社ごとにユニークでなければいけません。"
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
@@ -95,4 +95,39 @@ msgstr "請求書番号は会社ごとにユニークでなければいけませ
 msgid ""
 "This account will be used to value price difference between purchase price "
 "and cost price."
-msgstr "このアカウントを使って購買価格とコスト価格の違いを計算します"
+msgstr "このアカウントは仕入価格とコスト価格の価格差の値のために使われます。"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "オーダーリファレンスは固有である必要があります。"
+
+#~ msgid "Stock Accounting for Anglo Saxon countries"
+#~ msgstr "アングロサクソン諸国の株会計"
+
+#~ msgid ""
+#~ "This module will support the Anglo-Saxons accounting methodology by\n"
+#~ "    changing the accounting logic with stock transactions. The difference "
+#~ "between the Anglo-Saxon accounting countries\n"
+#~ "    and the Rhine or also called Continental accounting countries is the "
+#~ "moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+#~ "    Anglo-Saxons accounting does take the cost when sales invoice is "
+#~ "created, Continental accounting will take the cost at the moment the goods "
+#~ "are shipped.\n"
+#~ "    This module will add this functionality by using a interim account, to "
+#~ "store the value of shipped goods and will contra book this interim account\n"
+#~ "    when the invoice is created to transfer this amount to the debtor or "
+#~ "creditor account.\n"
+#~ "    Secondly, price differences between actual purchase price and fixed "
+#~ "product standard price are booked on a separate account"
+#~ msgstr ""
+#~ "このモジュールは次のようなアングロサクソン会計手法をサポートします：\n"
+#~ "　　株式取引の会計ロジックを変更します。アングロサクソン会計（英米型会計）国と、ラインまたは\n"
+#~ "　　コンチネンタル会計（大陸型会計）国と呼ばれる違いは売上原価の計上タイミングの違いです。\n"
+#~ "　　アングロサクソン会計は販売の請求書が作成された時に原価を計上します。コンチネンタル会計\n"
+#~ "　　では商品が出荷された時に原価を計上します。\n"
+#~ "　　このモジュールは中間勘定を使うことによってこの機能を加えます。借方または貸方アカウントに\n"
+#~ "　　その総額を転送するために請求書が作成された時に、出荷された商品の価値を保存し、そして\n"
+#~ "　　この中間勘定を反対記帳します。\n"
+#~ "　　第２に、実際の仕入価格と固定の製品標準価格の差は分離された勘定に記帳されます。"
+
+#~ msgid "Error ! You can not create recursive categories."
+#~ msgstr "エラーです。再帰的な関係となる分類を作ることはできません。"
diff --git a/addons/account_asset/i18n/ja.po b/addons/account_asset/i18n/ja.po
index 5f7c94a5cdb..37889bb1af1 100644
--- a/addons/account_asset/i18n/ja.po
+++ b/addons/account_asset/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-15 03:56+0000\n"
+"PO-Revision-Date: 2012-04-16 17:45+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-16 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
 "X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_asset
@@ -46,7 +46,7 @@ msgstr "資産の計算"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
diff --git a/addons/account_bank_statement_extensions/i18n/ja.po b/addons/account_bank_statement_extensions/i18n/ja.po
index 3ee81372600..b852e95c682 100644
--- a/addons/account_bank_statement_extensions/i18n/ja.po
+++ b/addons/account_bank_statement_extensions/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-16 03:50+0000\n"
+"PO-Revision-Date: 2012-04-16 23:00+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-16 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:52+0000\n"
 "X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_bank_statement_extensions
@@ -32,7 +32,7 @@ msgstr "確認済"
 #: view:account.bank.statement:0
 #: view:account.bank.statement.line:0
 msgid "Glob. Id"
-msgstr "グローバルID"
+msgstr "国際化ID"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
@@ -59,12 +59,12 @@ msgstr "選択した明細書行をキャンセル"
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "銀行情報のRIBまたはIBANが正しくありません。"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
@@ -87,7 +87,7 @@ msgstr "明細書"
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
 #: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
 msgid "Confirm selected statement lines"
-msgstr ""
+msgstr "選択した明細行の確認"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
@@ -104,7 +104,7 @@ msgstr "行のキャンセル"
 #: view:account.bank.statement.line.global:0
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
 msgid "Batch Payment Info"
-msgstr "一括払い情報"
+msgstr "バッチ支払情報"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -134,64 +134,64 @@ msgstr "仕訳帳"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Confirmed Statement Lines."
-msgstr ""
+msgstr "確認済みの明細書行"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "貸方取引"
 
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
 msgid "cancel selected statement lines."
-msgstr ""
+msgstr "選択明細行のキャンセル"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_number:0
 msgid "Counterparty Number"
-msgstr ""
+msgstr "相手方番号"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Transactions"
-msgstr ""
+msgstr "取引"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "締切残高"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 #: field:account.bank.statement.line,globalisation_amount:0
 msgid "Glob. Amount"
-msgstr ""
+msgstr "国際化金額"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Debit Transactions."
-msgstr ""
+msgstr "借方取引"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張したフィルタ…"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Confirmed lines cannot be changed anymore."
-msgstr ""
+msgstr "確認された行はもはや変更できません。"
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
@@ -200,6 +200,8 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"正当な支払いを行うために銀行タイプIBAN口座のための銀行にBIC/Swiftコードを定義して下さい。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
@@ -209,17 +211,17 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
 msgid "Confirm selected statement lines."
-msgstr ""
+msgstr "選択した明細行の確認をします。"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
-msgstr ""
+msgstr "選択した銀行明細行のキャンセルを本当に行いますか？"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
@@ -229,22 +231,22 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Notes"
-msgstr ""
+msgstr "注記"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "Manual"
-msgstr ""
+msgstr "手動"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金額"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -254,121 +256,121 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_currency:0
 msgid "Counterparty Currency"
-msgstr ""
+msgstr "相手方通貨"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "相手方BIC"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "子コード"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
-msgstr ""
+msgstr "選択した銀行明細行を本当に確認しますか？"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "バウチャーの金額は明細行のひとつの金額と同じでなければなりません。"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line,globalisation_id:0
 msgid ""
 "Code to identify transactions belonging to the same globalisation level "
 "within a batch payment"
-msgstr ""
+msgstr "バッチ支払いの中で、同じ国際化レベルに沿った取引を識別するためのコード"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Draft Statement Lines."
-msgstr ""
+msgstr "ドラフト明細行"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Glob. Am."
-msgstr ""
+msgstr "国際化総額"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "銀行明細行"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,code:0
 msgid "Code"
-msgstr ""
+msgstr "コード"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "相手方名"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,name:0
 msgid "Communication"
-msgstr ""
+msgstr "通信"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "銀行口座"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "選択された仕訳帳と期間は同じ会社に属していなければなりません。"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "銀行明細"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Line"
-msgstr ""
+msgstr "明細行"
 
 #. module: account_bank_statement_extensions
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr ""
+msgstr "コードは固有でなければなりません。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,bank_statement_line_ids:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
 #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
 msgid "Bank Statement Lines"
-msgstr ""
+msgstr "銀行明細行"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Child Batch Payments"
-msgstr ""
+msgstr "子バッチ支払い"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 #: view:confirm.statement.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Lines"
-msgstr ""
+msgstr "明細行"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Total Amount"
-msgstr ""
+msgstr "合計金額"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "国際化ID"
diff --git a/addons/account_bank_statement_extensions/i18n/pt.po b/addons/account_bank_statement_extensions/i18n/pt.po
new file mode 100644
index 00000000000..ac8c07acdc6
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/pt.po
@@ -0,0 +1,386 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-16 14:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <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: 2012-04-17 04:52+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Pesquisar operações bancárias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Glob. Id"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Código ascendente"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Cancelar linhas de instrução selecionadas"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "O RIB e / ou o IBAN não é válido"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Grupo por..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Afirmação"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Confirme linhas de instrução selecionados"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Declaração do Relatório dos Balanços do Banco"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Cancelar linhas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Informação do pagamento do lote"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirmar Linhas"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Excluir operação não permitida! Por favor, vá para o extracto bancário "
+"associado, a fim de eliminar e / ou modificar esta linha do extrato bancário"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Linhas de Declaração Confirmadas."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Operações de crédito."
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "Cancelar declaração de linhas selecionadas"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Número da contraparte"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transacções"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Aviso !"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Saldo de Encerramento"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Montante Global"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Operações de débito."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtros Avançados..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Linhas Confirmadas não pode ser alteradas."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Por favor defina BIC/ Código Swift no banco para conta bancária tipo IBAN "
+"para fazer pagamentos válidos"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Data Valuta"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Confirme linhas de instrução selecionadas."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Tem certeza que deseja cancelar as linhas de Declaração Bancárias "
+"selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Montante"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.Account"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moeda da contraparte"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC da contraparte"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos descendentes"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"Tem certeza de que pretende confirmar as linhas da Declaração Bancária "
+"selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"O montante do comprovativo deve ser o mesmo valor que o da linha de instrução"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Código para identificar as operações que pertencem ao mesmo nível de "
+"globalização dentro de um pagamento do lote"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Declaração das Linhas do rascunho."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Glob. Am."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Linha de extracto Bancário"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nome da contraparte"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Communicação"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Contas Bancárias"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "O diário e o período escolhidos devem pertencer à mesma empresa."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Linha de declaração"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "O código deve ser único !"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Linhas de Declarações Bancárias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Pagamentos em lote descendente"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Linhas da Declaração"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Montante total"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID Globalização"
diff --git a/addons/account_check_writing/i18n/pt.po b/addons/account_check_writing/i18n/pt.po
new file mode 100644
index 00000000000..3242b403328
--- /dev/null
+++ b/addons/account_check_writing/i18n/pt.po
@@ -0,0 +1,210 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-16 14:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <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: 2012-04-17 04:52+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Verifique no topo"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"A seleção da forma de pagamento permite que acompanhe o pagamento que faz "
+"aos seus fornecedores, especialmente por meio de cheque. Quando selecionar "
+"um fornecedor, o método de pagamento e um montante para o pagamento, OpenERP "
+"irá propor a conciliar o pagamento com as faturas de fornecedores ou contas "
+"abertas. Pode imprimir o cheque"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Imprimir Cheque"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Verifique no meio"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"Verifique no topo se é compatível com o Quicken, QuickBooks e Microsoft "
+"Money. Verifique no meio se é compatível com Peachtree, ACCPAC e DacEasy. "
+"Verifique na parte inferior se é compatível apenas com Peachtree, ACCPAC e "
+"DacEasy"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Verifique na parte inferior"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Não pode criar empresas recursivas."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "Marque esta opção se está a utilizar diáriamente cheques."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permitir que verifique a escrita"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Preencher cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Desconto"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Montante original"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuração"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permitir cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pagamento"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheques pré imprimidos"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "O nome da empresa deve ser único!"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Data da Dívida"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check layout"
+msgstr "Verificar disposição predefinida"
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Erro na configuração! A moeda escolhida deve ser partilhada também pelas "
+"contas padrão."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo devedor"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Verificar montante"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Voucher da Contabilidade"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "O nome do diário deve ser único por empresa!"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "O código do diário deve ser único por empresa!"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Valor em Palavra"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Abrir Balanço"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Escolha verificação da disposição"
diff --git a/addons/account_invoice_layout/i18n/gu.po b/addons/account_invoice_layout/i18n/gu.po
new file mode 100644
index 00000000000..b01663a7adf
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/gu.po
@@ -0,0 +1,355 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-16 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr "નોંધ:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr "શીર્ષક"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr "નોંધ"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
+msgstr "વર્ણન"
+
+#. module: account_invoice_layout
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Price"
+msgstr "કિંમત"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr "બિલ તારીખ"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Taxes:"
+msgstr "કર:"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr "સ્રોત ખાતુ"
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Base"
+msgstr "આધાર"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr "જથ્થો"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Refund"
+msgstr "વળતર"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr "ફેક્સ:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Total:"
+msgstr "કુલ:"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Select Message"
+msgstr "સંદેશ પસંદ કરો"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr "સંદેશાઓ"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr "વસ્તુ"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description / Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Amount"
+msgstr "કિંમત"
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr "ક્રમ નંબર"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Origin"
+msgstr "ઉદ્ભવ"
+
+#. module: account_invoice_layout
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices"
+msgstr "ઈનવોઈસ"
+
+#. module: account_invoice_layout
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tax"
+msgstr "કરવેરો"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
+msgid "Invoices and Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr "પ્રકાર"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr "બિલ"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.special.msg,message:0
+msgid "Message"
+msgstr "સંદેશો"
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr "કરવેરો"
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr ""
diff --git a/addons/auction/i18n/gu.po b/addons/auction/i18n/gu.po
new file mode 100644
index 00000000000..17ca8f5633d
--- /dev/null
+++ b/addons/auction/i18n/gu.po
@@ -0,0 +1,2357 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-16 11:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr "અહેવાલીકરણ"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr "શીર્ષક"
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr " "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr "ઓબ્જેક્ટ"
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr "લેખકો"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr "ખરીદનાર"
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr "કિંમત"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr "સંદર્ભ"
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "વિશ્લેષણાત્મક ખાતું"
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buy object"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr "તારીખ:"
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr "સ્થિતિ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr "જાન્યુઆરી"
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr "સંદર્ભ"
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS send"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr "વસ્તુઓ"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_object_categories
+msgid "Auction object Categories"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr "શ્રેણી"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr "સ્થિતિ"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr "ઑગસ્ટ"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr "જૂન"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "New Object"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr "ઑક્ટોબર"
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Object Category"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr "%)"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr "માર્ચ"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr "દ્દારા બનાવેલ છે"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:67
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr "ડ્રાફ્ટ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoiced Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr "છાપો"
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr "પ્રકાર"
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.module.category,name:auction.module_category_auction
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr "સપ્ટેમ્બર"
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr "અજ્ઞાત"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "No Invoice Address"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "This record does not exist !"
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr "કુલ રકમ"
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr ""
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr "તારીખ"
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr "ડેશબોર્ડ"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr "નવેમ્બર"
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr "ઈતિહાસ"
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr "કોડ"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.taken:0
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices For Seller"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr "કિંમત"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr "-"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr "ફોટાઓ"
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
+#, python-format
+msgid "Active IDs not Found"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:166
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+#: model:ir.actions.act_window,name:auction.action_bid_open
+msgid "Open Bids"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr "નામ"
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: view:auction.lots:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_adjudication_tree
+msgid "Auction Adjudication Report"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr "લોગ ઇન"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:166
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "Error"
+msgstr "ભૂલ"
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr "ગ્રુપ દ્વારા..."
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during last month."
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr "સુધારો"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr "વેચનાર"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Draft Auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr "નોંધ"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr "લેખક / કલાકાર"
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr "ખરીદનાર ઉપભોક્તા"
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr "પ્રાથમિકતા"
+
+#. module: auction
+#: view:board.board:0
+#: model:ir.actions.act_window,name:auction.action_report_latest_objects_tree
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr "સ્થળ"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "This lot does not exist !"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr "જુલાઈ"
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid "Payment aborted !"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr "મહિનો"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr "લોત"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_object_date_tree
+msgid "Auction Object Date"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr "ફોન"
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr "સક્રિય"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr "કુલ:"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "Missed buyer !"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:67
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr "બિલ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr "મોકલો"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr "લાઈન૩"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr "લાઈન૨"
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr "વસ્તુ"
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr ")"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr "ઘટકો"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices For Buyer"
+msgstr ""
+
+#. module: auction
+#: model:res.groups,name:auction.group_auction_manager
+msgid "Manager"
+msgstr "વ્યવસ્થાપક"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr "કલાકારો"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_artist
+msgid "Auction Artists"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+msgid "Frais de vente0"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr "વિધાન"
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:89
+#, python-format
+msgid "Error!"
+msgstr "ભૂલ!"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_latest_doposit_tree
+msgid "Latest Deposits"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr "બરાબર"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr "દિવસ"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr ""
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr "બંધ થયેલ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr "મદદપત્રિકા"
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr "રુપરેખાંકન"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_object_date_tree_my
+msgid "My Auction Object Date"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr "ડિસેમ્બર"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr "ચિત્ર"
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr "શ્રેણીનું નામ"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr "........."
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+#: model:res.groups,name:auction.group_auction_user
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "Missed Address !"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object.      "
+"           \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold.                 \n"
+"* The 'Paid' state is used when user pay for the object                 \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr ""
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr "સામાન્ય માહિતી"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr "બંધ"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr ""
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:89
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr "વર્ણન"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr "મે"
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr "પાસવર્ડ"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr "ફેબ્રુઆરી"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr "એપ્રિલ"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr "ખર્ચાઓ"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during current month."
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during current year."
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr "વર્ષ"
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr ""
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index 5d7f6e0c551..e38caf8c8af 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-16 04:19+0000\n"
+"PO-Revision-Date: 2012-04-17 03:29+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-16 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
 "X-Generator: Launchpad (build 15099)\n"
 
 #. module: crm
@@ -46,7 +46,7 @@ msgstr "お問い合わせ対応状況"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr ""
+msgstr "表示"
 
 #. module: crm
 #: field:crm.lead,title:0
@@ -435,7 +435,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "プライバシー"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_stage_form_installer
@@ -451,12 +451,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "商談分析"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "イベント場所"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
@@ -490,7 +490,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: crm
 #: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
@@ -513,7 +513,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -523,7 +523,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "メール"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -535,7 +535,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -572,12 +572,12 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "パートナの担当者名"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "終了日"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -615,7 +615,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "進行中"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -643,7 +643,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "詳細"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -675,7 +675,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "営業"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -685,7 +685,7 @@ msgstr ""
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "作成月"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -753,7 +753,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall2partner:0
 msgid "Continue"
-msgstr ""
+msgstr "続行"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -792,18 +792,18 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "%s : %sから"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "作成年"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: crm
 #: field:crm.lead,ref2:0
@@ -876,7 +876,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "仕入先"
 
 #. module: crm
 #: view:crm.lead:0
@@ -886,7 +886,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr ""
+msgstr "仕入高"
 
 #. module: crm
 #: view:crm.lead:0
@@ -898,7 +898,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
@@ -906,7 +906,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_lead_to_partner.py:47
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -916,7 +916,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "開始日"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -931,22 +931,22 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. module: crm
 #: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "携帯電話"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "次へ"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "私のミーティング"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -961,7 +961,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "参照"
 
 #. module: crm
 #: field:crm.lead,optin:0
@@ -978,13 +978,13 @@ msgstr ""
 #: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "ミーティング"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0 field:crm.lead,title_action:0
 #: field:crm.meeting,date_action_next:0 field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "次の作業"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
@@ -994,7 +994,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "期限"
 
 #. module: crm
 #: help:crm.meeting,active:0
@@ -1006,7 +1006,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "色の変更"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1017,7 +1017,7 @@ msgstr ""
 #: field:crm.meeting,user_id:0 view:crm.phonecall:0
 #: field:crm.phonecall,user_id:0 view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "担当"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1027,12 +1027,12 @@ msgstr ""
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "前へ"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "新規見込み客"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1042,7 +1042,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "From"
-msgstr ""
+msgstr "差出人"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -1052,32 +1052,32 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "営業チームを表示"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "次へ"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "段階"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5 view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "勝利"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "期限を過ぎる。"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "営業部"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1088,7 +1088,7 @@ msgstr ""
 #: field:crm.lead,type:0 field:crm.lead.report,type:0
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1105,12 +1105,12 @@ msgstr ""
 #: view:crm.phonecall:0 field:crm.phonecall,create_date:0
 #: field:crm.phonecall.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "私の商談"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1130,28 +1130,28 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:res.partner:0
 msgid "Subject"
-msgstr ""
+msgstr "標題"
 
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "火曜日"
 
 #. module: crm
 #: view:crm.case.stage:0 view:crm.lead:0 field:crm.lead,stage_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "段階"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "履歴情報"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "パートナへ送付する。"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -1166,7 +1166,7 @@ msgstr ""
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "通話記録"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
@@ -1190,7 +1190,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_lead_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "段階"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -1211,7 +1211,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1229,7 +1229,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "通話分析"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1250,12 +1250,12 @@ msgstr ""
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "商談名"
 
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "受注見込日"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1267,7 +1267,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "番地"
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
@@ -1279,7 +1279,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "金曜日"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -1289,7 +1289,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "記入日"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1299,7 +1299,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
-msgstr ""
+msgstr "リマインダー"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1316,7 +1316,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "通話予定"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1324,7 +1324,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "パートナを作成"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1346,17 +1346,17 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "月曜日"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "契約日"
 
 #. module: crm
 #: field:crm.case.section,complete_name:0
 msgid "unknown"
-msgstr ""
+msgstr "不明"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:296
@@ -1374,7 +1374,7 @@ msgstr ""
 #: view:crm.phonecall:0 field:crm.phonecall,date:0
 #: field:crm.phonecall2phonecall,date:0 view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -1389,12 +1389,12 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "検索"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "商談"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
@@ -1404,7 +1404,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "通話日"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1426,7 +1426,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "ミーティング予定"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:431
@@ -3567,13 +3567,13 @@ msgstr "秒"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Proposition"
-msgstr ""
+msgstr "案件"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "契約日"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -3584,7 +3584,7 @@ msgstr "年"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラーです。再帰的な関係となる会員を作ることはできません。"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
new file mode 100644
index 00000000000..1486a75741d
--- /dev/null
+++ b/addons/hr/i18n/ja.po
@@ -0,0 +1,695 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-04-17 01:59+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr "OpenERPユーザ"
+
+#. module: hr
+#: view:hr.job:0 field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "必要事項"
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You can not create recursive departments."
+msgstr "エラー。反復する部署を作ることはできません。"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
+#: model:ir.ui.menu,name:hr.menu_hr_root
+msgid "Human Resources"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0 view:hr.job:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.view_department_form_installer
+msgid "Create Your Departments"
+msgstr "部門を作る"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"Job Positions are used to define jobs and their requirements. You can keep "
+"track of the number of employees you have per job position and how many you "
+"expect in the future. You can also attach a survey to a job position that "
+"will be used in the recruitment process to evaluate the applicants for this "
+"job position."
+msgstr ""
+"職種は、仕事内容とその要件を定義するのに使います。職種ごとの従業員数と将来の必要人数を記録することができます。職種への応募者を評価するための採用プロセスで"
+"使う質問票を、ここに添付することができます。"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
+#: field:hr.job,department_id:0 view:res.users:0
+msgid "Department"
+msgstr "部門"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr "古い印をつける。"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "業務"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "採用中"
+
+#. module: hr
+#: field:hr.department,company_id:0 view:hr.employee:0 view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr "採用予定"
+
+#. module: hr
+#: model:ir.actions.todo.category,name:hr.category_hr_management_config
+msgid "HR Management"
+msgstr "人材管理"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr "この従業員に関係するパートナ。会計トトランザクションは従業員に関係するこのパートナについて記録されます。"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr "ユーザを従業員に連携"
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "上位の部門"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,notes:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Married"
+msgstr "既婚"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_create_hr_employee_installer
+msgid ""
+"Create employees form and link them to an OpenERP user if you want them to "
+"access this instance. Categories can be set on employees to perform massive "
+"operations on all the employees of the same category, i.e. allocating "
+"holidays."
+msgstr ""
+"従業員を作成して、このインスタンスをアクセスできるようにOpenERPに連携する。従業員に区分を設定すると，同じ区分の全ての従業員と同じ処理が適用されるま"
+"す。例えば、休日の割当てなど。"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Department Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitments, etc."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,color:0
+msgid "Color Index"
+msgstr "カラーインデックス"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr "従業員票のユーザ項目を使って、この従業員をOpenERPユーザとして連携することができます。"
+
+#. module: hr
+#: view:hr.job:0 selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr "採用中"
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr "識別番号"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr "女"
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid "Required number of employees in total for that job."
+msgstr "この職種に必要な従業員の数"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendance"
+msgstr "出欠"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Social IDs"
+msgstr "社会保障番号"
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr "勤務先電話"
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr "子関係の区分"
+
+#. module: hr
+#: view:hr.job:0 field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr "職務内容"
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr "勤務先住所"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "My Departments Employee"
+msgstr "私の部門の従業員"
+
+#. module: hr
+#: view:hr.employee:0 model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr "その他の情報"
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr "勤務先のEメール"
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "誕生日"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+msgid "Reporting"
+msgstr "レポート"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+#: model:ir.ui.menu,name:hr.menu_hr_dashboard_user
+msgid "Human Resources Dashboard"
+msgstr "人材ダッシュボード"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
+msgid "Job"
+msgstr "職務"
+
+#. module: hr
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr "メンバー"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "設定"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,category_ids:0
+msgid "Categories"
+msgstr "区分"
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr "従業員候補"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Divorced"
+msgstr "離婚"
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr "親分類"
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr "エラー。反復区分を作ることはできません。"
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: field:res.users,context_department_id:0
+msgid "Departments"
+msgstr "部門"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr "従業員の連絡先"
+
+#. module: hr
+#: view:board.board:0
+msgid "My Board"
+msgstr "私のボード"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr "男"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "従業員の区分"
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr "従業員の区分"
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr "従業員契約"
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_department
+msgid "hr.department"
+msgstr "hr.department"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
+msgid "Create your Employees"
+msgstr "従業員を作成する。"
+
+#. module: hr
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr "分類"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+"ここでは従業員を作成して、各人の特性を指定することができます。個人情報タブでは、従業員に関する必要な情報を記録・保持してください。カテゴリータブでは、従業"
+"員の職位と職種に応じたカテゴリーを割り当てることができます。カテゴリーは、会社あるいは部門における年功のレベルで決まるでしょう。タイムシートタブでは、従業"
+"員に分析記録のためのタイムシートを割り当てて、本人が作業時間を記録するのに使います。注記タブでは、その従業員に関する情報を追記することができます。"
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr "従業員の給与振込の銀行口座"
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr "注記"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr "従業員体系"
+
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr "連絡先の情報"
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "勤務先住所"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
+msgid "HR Manager Dashboard"
+msgstr "人事マネジャのダッシュボード"
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr "下位部門"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr "ステータス"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_tree
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
+msgid "Categories structure"
+msgstr "カテゴリー体系"
+
+#. module: hr
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employees with that job."
+msgstr "この職種の従業員数"
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "社会保障番号"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr "有効"
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "エラー。従業員の反復した階層構造を作ることはできません。"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Subordonate Hierarchy"
+msgstr "下位の階層構造"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.view_department_form_installer
+msgid ""
+"Your departments structure is used to manage all documents related to "
+"employees by departments: expenses and timesheet validation, leaves "
+"management, recruitments, etc."
+msgstr "部門組織構造は，従業員に関する全ての文書を管理するために使われます。：経費、タイムシートの検証、休暇の管理、採用など。"
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account Number"
+msgstr "銀行口座番号"
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr "会社"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr "従業員票には、連絡先などのように異なる種類の情報があります。"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_dashboard
+msgid "Dashboard"
+msgstr "ダッシュボード"
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr "旧"
+
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同一のログインに２つのユーザを指定することはできません。"
+
+#. module: hr
+#: view:hr.job:0 field:hr.job,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr
+#: field:hr.employee,marital:0
+msgid "Marital Status"
+msgstr "婚姻区分"
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr "ir.actions.act_window"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr "従業員票と構造"
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr "写真"
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr "個人情報"
+
+#. module: hr
+#: field:hr.employee,city:0
+msgid "City"
+msgstr "市"
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr "旅券番号"
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Work Mobile"
+msgstr "会社の携帯"
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr "従業員カテゴリー"
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr "自宅住所"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Single"
+msgstr "独身"
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr "職務名"
+
+#. module: hr
+#: view:hr.job:0 selection:hr.job,state:0
+msgid "In Position"
+msgstr "職位"
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr "部門"
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr "国籍"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Leaves"
+msgstr "作業終了"
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr "人材マネジャボード"
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr "リソース"
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr "性別"
+
+#. module: hr
+#: view:hr.employee:0 view:hr.employee.category:0
+#: field:hr.employee.category,employee_ids:0 view:hr.job:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
+msgid "Employees"
+msgstr "従業員"
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr "社会保険番号"
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr "部門名"
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr "社会保障番号"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr "OpenERPユーザ作成日"
+
+#. module: hr
+#: field:hr.employee,login:0
+msgid "Login"
+msgstr "ログイン"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Job Information"
+msgstr "職務情報"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr "職位"
+
+#. module: hr
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr "その他のID"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr "コーチ"
+
+#. module: hr
+#: sql_constraint:hr.job:0
+msgid "The name of the job position must be unique per company!"
+msgstr "職位名は会社ごとにユニークでなければいけません。"
+
+#. module: hr
+#: view:hr.job:0
+msgid "My Departments Jobs"
+msgstr "私の部門の職種"
+
+#. module: hr
+#: field:hr.department,manager_id:0 view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Widower"
+msgstr "寡夫"
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "部下"
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "Number of Employees"
+msgstr "従業員数"
diff --git a/addons/hr_payroll/i18n/ja.po b/addons/hr_payroll/i18n/ja.po
index b0ed529374f..1d1144a8b6d 100644
--- a/addons/hr_payroll/i18n/ja.po
+++ b/addons/hr_payroll/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-16 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
 "X-Generator: Launchpad (build 15099)\n"
 
 #. module: hr_payroll
@@ -674,7 +674,7 @@ msgstr "子のクラスのルール"
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "エラー。従業員の反復した階層構造を定義することはできません。"
+msgstr "エラー。従業員の反復した階層構造を作ることはできません。"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
diff --git a/addons/mrp_repair/i18n/sr@latin.po b/addons/mrp_repair/i18n/sr@latin.po
index 1902ff9d981..24da07afb79 100644
--- a/addons/mrp_repair/i18n/sr@latin.po
+++ b/addons/mrp_repair/i18n/sr@latin.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-23 16:21+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-04-16 16:35+0000\n"
+"Last-Translator: Maroje Delibasic <maroje.delibasic@gmail.com>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:50+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -102,7 +102,7 @@ msgstr "Fakturisati"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Printing Date"
-msgstr "Datum Štampanja"
+msgstr "Datum štampanja"
 
 #. module: mrp_repair
 #: field:mrp.repair.make_invoice,group:0
@@ -171,7 +171,7 @@ msgstr "Napomene"
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr "Takse"
+msgstr "Porezi"
 
 #. module: mrp_repair
 #: report:repair.order:0
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
new file mode 100644
index 00000000000..4f675076ece
--- /dev/null
+++ b/addons/web/i18n/gu.po
@@ -0,0 +1,1544 @@
+# Gujarati translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-04-16 11:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:172
+#: addons/web/static/src/js/chrome.js:198
+#: addons/web/static/src/js/chrome.js:414
+#: addons/web/static/src/js/view_form.js:419
+#: addons/web/static/src/js/view_form.js:1233
+#: addons/web/static/src/xml/base.xml:1695
+#: addons/web/static/src/js/view_form.js:424
+#: addons/web/static/src/js/view_form.js:1239
+msgid "Ok"
+msgstr "બરાબર"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:180
+msgid "Send OpenERP Enterprise Report"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:194
+msgid "Dont send"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:256
+#, python-format
+msgid "Loading (%d)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:288
+msgid "Invalid database name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:483
+msgid "Backed"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:484
+msgid "Database backed up successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:527
+msgid "Restored"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:527
+msgid "Database restored successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:708
+#: addons/web/static/src/xml/base.xml:359
+msgid "About"
+msgstr "ના વિશે"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:787
+#: addons/web/static/src/xml/base.xml:356
+msgid "Preferences"
+msgstr "સામાન્ય પસંદગીઓ"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:790
+#: addons/web/static/src/js/search.js:239
+#: addons/web/static/src/js/search.js:288
+#: addons/web/static/src/js/view_editor.js:95
+#: addons/web/static/src/js/view_editor.js:836
+#: addons/web/static/src/js/view_editor.js:962
+#: addons/web/static/src/js/view_form.js:1228
+#: addons/web/static/src/xml/base.xml:738
+#: addons/web/static/src/xml/base.xml:1496
+#: addons/web/static/src/xml/base.xml:1506
+#: addons/web/static/src/xml/base.xml:1515
+#: addons/web/static/src/js/search.js:293
+#: addons/web/static/src/js/view_form.js:1234
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:791
+msgid "Change password"
+msgstr "પાસવર્ડ બદલો"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:792
+#: addons/web/static/src/js/view_editor.js:73
+#: addons/web/static/src/js/views.js:962
+#: addons/web/static/src/xml/base.xml:737
+#: addons/web/static/src/xml/base.xml:1500
+#: addons/web/static/src/xml/base.xml:1514
+msgid "Save"
+msgstr "સાચવો"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:811
+#: addons/web/static/src/xml/base.xml:226
+#: addons/web/static/src/xml/base.xml:1729
+msgid "Change Password"
+msgstr "પાસવર્ડ બદલો"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:1096
+#: addons/web/static/src/js/chrome.js:1100
+msgid "OpenERP - Unsupported/Community Version"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:1131
+#: addons/web/static/src/js/chrome.js:1135
+msgid "Client Error"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:6
+msgid "Export Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:19
+#: addons/web/static/src/js/data_import.js:69
+#: addons/web/static/src/js/view_editor.js:49
+#: addons/web/static/src/js/view_editor.js:398
+#: addons/web/static/src/js/view_form.js:692
+#: addons/web/static/src/js/view_form.js:3044
+#: addons/web/static/src/js/views.js:963
+#: addons/web/static/src/js/view_form.js:698
+#: addons/web/static/src/js/view_form.js:3067
+msgid "Close"
+msgstr "બંધ કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:20
+msgid "Export To File"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:125
+msgid "Please enter save field list name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:360
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:373
+msgid "Please select fields to export..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:34
+msgid "Import Data"
+msgstr "માહિતી આયાત કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:70
+msgid "Import File"
+msgstr "ફાઈલ આયાત કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:105
+msgid "External ID"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:300
+#: addons/web/static/src/js/view_page.js:245
+#: addons/web/static/src/js/formats.js:322
+#: addons/web/static/src/js/view_page.js:251
+msgid "Download"
+msgstr "ડાઉનલોડ"
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:305
+#: addons/web/static/src/js/formats.js:327
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:191
+msgid "Filter disabled due to invalid syntax"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:237
+msgid "Filter Entry"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:242
+#: addons/web/static/src/js/search.js:291
+#: addons/web/static/src/js/search.js:296
+msgid "OK"
+msgstr "ઓકે"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:286
+#: addons/web/static/src/xml/base.xml:1292
+#: addons/web/static/src/js/search.js:291
+msgid "Add to Dashboard"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:415
+#: addons/web/static/src/js/search.js:420
+msgid "Invalid Search"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:415
+#: addons/web/static/src/js/search.js:420
+msgid "triggered from search view"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:503
+#: addons/web/static/src/js/search.js:508
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:839
+#: addons/web/static/src/js/search.js:844
+msgid "not a valid integer"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:853
+#: addons/web/static/src/js/search.js:858
+msgid "not a valid number"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:931
+#: addons/web/static/src/xml/base.xml:968
+#: addons/web/static/src/js/search.js:936
+msgid "Yes"
+msgstr "હાં"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:932
+#: addons/web/static/src/js/search.js:937
+msgid "No"
+msgstr "નહીં"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1290
+#: addons/web/static/src/js/search.js:1295
+msgid "contains"
+msgstr "સમાવે છે"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1291
+#: addons/web/static/src/js/search.js:1296
+msgid "doesn't contain"
+msgstr "સમાવતું નથી"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1292
+#: addons/web/static/src/js/search.js:1306
+#: addons/web/static/src/js/search.js:1325
+#: addons/web/static/src/js/search.js:1344
+#: addons/web/static/src/js/search.js:1365
+#: addons/web/static/src/js/search.js:1297
+#: addons/web/static/src/js/search.js:1311
+#: addons/web/static/src/js/search.js:1330
+#: addons/web/static/src/js/search.js:1349
+#: addons/web/static/src/js/search.js:1370
+msgid "is equal to"
+msgstr "ને બરાબર છે"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1293
+#: addons/web/static/src/js/search.js:1307
+#: addons/web/static/src/js/search.js:1326
+#: addons/web/static/src/js/search.js:1345
+#: addons/web/static/src/js/search.js:1366
+#: addons/web/static/src/js/search.js:1298
+#: addons/web/static/src/js/search.js:1312
+#: addons/web/static/src/js/search.js:1331
+#: addons/web/static/src/js/search.js:1350
+#: addons/web/static/src/js/search.js:1371
+msgid "is not equal to"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1294
+#: addons/web/static/src/js/search.js:1308
+#: addons/web/static/src/js/search.js:1327
+#: addons/web/static/src/js/search.js:1346
+#: addons/web/static/src/js/search.js:1367
+#: addons/web/static/src/js/search.js:1299
+#: addons/web/static/src/js/search.js:1313
+#: addons/web/static/src/js/search.js:1332
+#: addons/web/static/src/js/search.js:1351
+#: addons/web/static/src/js/search.js:1372
+msgid "greater than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1295
+#: addons/web/static/src/js/search.js:1309
+#: addons/web/static/src/js/search.js:1328
+#: addons/web/static/src/js/search.js:1347
+#: addons/web/static/src/js/search.js:1368
+#: addons/web/static/src/js/search.js:1300
+#: addons/web/static/src/js/search.js:1314
+#: addons/web/static/src/js/search.js:1333
+#: addons/web/static/src/js/search.js:1352
+#: addons/web/static/src/js/search.js:1373
+msgid "less than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1296
+#: addons/web/static/src/js/search.js:1310
+#: addons/web/static/src/js/search.js:1329
+#: addons/web/static/src/js/search.js:1348
+#: addons/web/static/src/js/search.js:1369
+#: addons/web/static/src/js/search.js:1301
+#: addons/web/static/src/js/search.js:1315
+#: addons/web/static/src/js/search.js:1334
+#: addons/web/static/src/js/search.js:1353
+#: addons/web/static/src/js/search.js:1374
+msgid "greater or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1297
+#: addons/web/static/src/js/search.js:1311
+#: addons/web/static/src/js/search.js:1330
+#: addons/web/static/src/js/search.js:1349
+#: addons/web/static/src/js/search.js:1370
+#: addons/web/static/src/js/search.js:1302
+#: addons/web/static/src/js/search.js:1316
+#: addons/web/static/src/js/search.js:1335
+#: addons/web/static/src/js/search.js:1354
+#: addons/web/static/src/js/search.js:1375
+msgid "less or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1360
+#: addons/web/static/src/js/search.js:1383
+#: addons/web/static/src/js/search.js:1365
+#: addons/web/static/src/js/search.js:1388
+msgid "is"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1384
+#: addons/web/static/src/js/search.js:1389
+msgid "is not"
+msgstr "એ નથી"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1396
+#: addons/web/static/src/js/search.js:1401
+msgid "is true"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1397
+#: addons/web/static/src/js/search.js:1402
+msgid "is false"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:20
+#, python-format
+msgid "Manage Views (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:46
+#: addons/web/static/src/js/view_list.js:17
+#: addons/web/static/src/xml/base.xml:100
+#: addons/web/static/src/xml/base.xml:327
+#: addons/web/static/src/xml/base.xml:756
+msgid "Create"
+msgstr "બનાવો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:47
+#: addons/web/static/src/xml/base.xml:483
+#: addons/web/static/src/xml/base.xml:755
+msgid "Edit"
+msgstr "ફેરફાર કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:48
+#: addons/web/static/src/xml/base.xml:1647
+msgid "Remove"
+msgstr "દૂર કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:71
+#, python-format
+msgid "Create a view (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:168
+msgid "Do you really want to remove this view?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:364
+#, python-format
+msgid "View Editor %d - %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:367
+msgid "Inherited View"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:371
+msgid "Do you really wants to create an inherited view here?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:381
+msgid "Preview"
+msgstr "પૂર્વદર્શન"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:501
+msgid "Do you really want to remove this node?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:815
+#: addons/web/static/src/js/view_editor.js:939
+msgid "Properties"
+msgstr "ગુણધર્મો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:818
+#: addons/web/static/src/js/view_editor.js:942
+msgid "Update"
+msgstr "સુધારો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:16
+msgid "Form"
+msgstr "ફોર્મ"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:121
+#: addons/web/static/src/js/views.js:803
+msgid "Customize"
+msgstr "વૈવિધ્યપૂર્ણ"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:123
+#: addons/web/static/src/js/view_form.js:686
+#: addons/web/static/src/js/view_form.js:692
+msgid "Set Default"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:469
+#: addons/web/static/src/js/view_form.js:475
+msgid ""
+"Warning, the record has been modified, your changes will be discarded."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:693
+#: addons/web/static/src/js/view_form.js:699
+msgid "Save default"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:754
+#: addons/web/static/src/js/view_form.js:760
+msgid "Attachments"
+msgstr "જોડાણો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:792
+#: addons/web/static/src/js/view_form.js:798
+#, python-format
+msgid "Do you really want to delete the attachment %s?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:822
+#: addons/web/static/src/js/view_form.js:828
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:830
+#: addons/web/static/src/js/view_form.js:836
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:868
+#: addons/web/static/src/js/view_form.js:874
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1225
+#: addons/web/static/src/js/view_form.js:1231
+msgid "Confirm"
+msgstr "ખાતરી"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1921
+#: addons/web/static/src/js/view_form.js:2578
+#: addons/web/static/src/js/view_form.js:2741
+#: addons/web/static/src/js/view_form.js:1933
+#: addons/web/static/src/js/view_form.js:2590
+#: addons/web/static/src/js/view_form.js:2760
+msgid "Open: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2049
+#: addons/web/static/src/js/view_form.js:2061
+msgid "<em>   Search More...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2074
+#, python-format
+msgid "<em>   Create \"<strong>%s</strong>\"</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2068
+#: addons/web/static/src/js/view_form.js:2080
+msgid "<em>   Create and Edit...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2101
+#: addons/web/static/src/js/views.js:675
+#: addons/web/static/src/js/view_form.js:2113
+msgid "Search: "
+msgstr "શોધો: "
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2101
+#: addons/web/static/src/js/view_form.js:2550
+#: addons/web/static/src/js/view_form.js:2113
+#: addons/web/static/src/js/view_form.js:2562
+msgid "Create: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2661
+#: addons/web/static/src/xml/base.xml:750
+#: addons/web/static/src/xml/base.xml:772
+#: addons/web/static/src/xml/base.xml:1646
+#: addons/web/static/src/js/view_form.js:2680
+msgid "Add"
+msgstr "ઉમેરવું"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2721
+#: addons/web/static/src/js/view_form.js:2740
+msgid "Add: "
+msgstr "ઉમેરવું: "
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:8
+msgid "List"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:269
+msgid "Unlimited"
+msgstr "અમર્યાદિત"
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:305
+#: addons/web/static/src/js/view_list.js:309
+#, python-format
+msgid "[%(first_record)d to %(last_record)d] of %(records_count)d"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:524
+#: addons/web/static/src/js/view_list.js:528
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1230
+#: addons/web/static/src/js/view_list.js:1232
+msgid "Undefined"
+msgstr "અવ્યાખ્યાયિત"
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1327
+#: addons/web/static/src/js/view_list.js:1331
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_page.js:8
+msgid "Page"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_page.js:52
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_tree.js:11
+msgid "Tree"
+msgstr "ટ્રી"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:565
+#: addons/web/static/src/xml/base.xml:480
+msgid "Fields View Get"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:573
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:600
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:610
+#: addons/web/static/src/xml/base.xml:482
+msgid "Manage Views"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:611
+msgid "Could not find current view declaration"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:805
+msgid "Translate"
+msgstr "ભાષાંતર"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:807
+msgid "Technical translation"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:811
+msgid "Other Options"
+msgstr "અન્ય વિકલ્પો"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:814
+#: addons/web/static/src/xml/base.xml:1736
+msgid "Import"
+msgstr "આયાત"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:817
+#: addons/web/static/src/xml/base.xml:1606
+msgid "Export"
+msgstr "નિકાસ"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "Reports"
+msgstr "અહેવાલો"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "Actions"
+msgstr "ક્રિયાઓ"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "Links"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:919
+msgid "You must choose at least one record."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:920
+msgid "Warning"
+msgstr "ચેતવણી"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:957
+msgid "Translations"
+msgstr "ભાષાંતરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:44
+#: addons/web/static/src/xml/base.xml:315
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:44
+#: addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:1813
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:52
+msgid "Loading..."
+msgstr "લાવી રહ્યા છીએ..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:61
+msgid "CREATE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:68
+#: addons/web/static/src/xml/base.xml:211
+msgid "Master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:72
+#: addons/web/static/src/xml/base.xml:191
+msgid "New database name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:77
+msgid "Load Demonstration data:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:81
+msgid "Default language:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:91
+msgid "Admin password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:95
+msgid "Confirm password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:109
+msgid "DROP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:116
+#: addons/web/static/src/xml/base.xml:150
+#: addons/web/static/src/xml/base.xml:301
+msgid "Database:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:128
+#: addons/web/static/src/xml/base.xml:162
+#: addons/web/static/src/xml/base.xml:187
+msgid "Master Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:132
+#: addons/web/static/src/xml/base.xml:328
+msgid "Drop"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:143
+msgid "BACKUP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:166
+#: addons/web/static/src/xml/base.xml:329
+msgid "Backup"
+msgstr "બેકઅપ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:175
+msgid "RESTORE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:182
+msgid "File:"
+msgstr "ફાઇલ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:195
+#: addons/web/static/src/xml/base.xml:330
+msgid "Restore"
+msgstr "પુનઃસ્થાપિત કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:204
+msgid "CHANGE MASTER PASSWORD"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:216
+msgid "New master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:221
+msgid "Confirm new master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:251
+msgid ""
+"Your version of OpenERP is unsupported. Support & maintenance services are "
+"available here:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:251
+msgid "OpenERP Entreprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:256
+msgid "OpenERP Enterprise Contract."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:257
+msgid "Your report will be sent to the OpenERP Enterprise team."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:259
+msgid "Summary:"
+msgstr "સાર:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:263
+msgid "Description:"
+msgstr "વર્ણન:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:267
+msgid "What you did:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:297
+msgid "Invalid username or password"
+msgstr "અયોગ્ય વપરાશકર્તા નામ અથવા પાસવર્ડ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:306
+msgid "Username"
+msgstr "વપરાશકર્તા નામ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:308
+#: addons/web/static/src/xml/base.xml:331
+msgid "Password"
+msgstr "પાસવર્ડ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:310
+msgid "Log in"
+msgstr "લોગ ઇન"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:314
+msgid "Manage Databases"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:332
+msgid "Back to Login"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:353
+msgid "Home"
+msgstr "હોમ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:363
+msgid "LOGOUT"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:388
+msgid "Fold menu"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:389
+msgid "Unfold menu"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:454
+msgid "Hide this tip"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:455
+msgid "Disable all tips"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:463
+msgid "Add / Remove Shortcut..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:471
+msgid "More…"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:477
+msgid "Debug View#"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:478
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:479
+msgid "View Fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:483
+msgid "View"
+msgstr "દેખાવ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:484
+msgid "Edit SearchView"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:485
+msgid "Edit Action"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:486
+msgid "Edit Workflow"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:491
+msgid "ID:"
+msgstr "ID:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:494
+msgid "XML ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:497
+msgid "Creation User:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:500
+msgid "Creation Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:503
+msgid "Latest Modification by:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:506
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:542
+msgid "Field"
+msgstr "ક્ષેત્ર"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:632
+#: addons/web/static/src/xml/base.xml:758
+#: addons/web/static/src/xml/base.xml:1708
+msgid "Delete"
+msgstr "રદ્દ કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:757
+msgid "Duplicate"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:775
+msgid "Add attachment"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:801
+msgid "Default:"
+msgstr "મૂળભૂત:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:818
+msgid "Condition:"
+msgstr "શરત:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:837
+msgid "Only you"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:844
+msgid "All users"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:851
+msgid "Unhandled widget"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:900
+msgid "Notebook Page \""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:905
+#: addons/web/static/src/xml/base.xml:964
+msgid "Modifiers:"
+msgstr "સુધારકો:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:931
+msgid "(nolabel)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:936
+msgid "Field:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:940
+msgid "Object:"
+msgstr "વસ્તુ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:944
+msgid "Type:"
+msgstr "પ્રકાર:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:948
+msgid "Widget:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:952
+msgid "Size:"
+msgstr "કદ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:956
+msgid "Context:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:960
+msgid "Domain:"
+msgstr "ડોમેઇન:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:968
+msgid "Change default:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:972
+msgid "On change:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:976
+msgid "Relation:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:980
+msgid "Selection:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1020
+msgid "Send an e-mail with your default e-mail client"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1034
+msgid "Open this resource"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1056
+msgid "Select date"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1090
+msgid "Open..."
+msgstr "ખોલો..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1091
+msgid "Create..."
+msgstr "બનાવો..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1092
+msgid "Search..."
+msgstr "શોધ..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1095
+msgid "..."
+msgstr "..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1155
+#: addons/web/static/src/xml/base.xml:1198
+msgid "Set Image"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1163
+#: addons/web/static/src/xml/base.xml:1213
+#: addons/web/static/src/xml/base.xml:1215
+#: addons/web/static/src/xml/base.xml:1272
+msgid "Clear"
+msgstr "સાફ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1172
+#: addons/web/static/src/xml/base.xml:1223
+msgid "Uploading ..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1200
+#: addons/web/static/src/xml/base.xml:1495
+msgid "Select"
+msgstr "પસંદ કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1207
+#: addons/web/static/src/xml/base.xml:1209
+msgid "Save As"
+msgstr "આ રીતે સંગ્રહિત કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1238
+msgid "Button"
+msgstr "બટન"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1241
+msgid "(no string)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1248
+msgid "Special:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1253
+msgid "Button Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1257
+msgid "Method:"
+msgstr "પદ્દતિ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1261
+msgid "Action ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1271
+msgid "Search"
+msgstr "શોધો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1279
+msgid "Filters"
+msgstr "ફિલ્ટરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1280
+msgid "-- Filters --"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1289
+msgid "-- Actions --"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1290
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1291
+msgid "Save Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1293
+msgid "Manage Filters"
+msgstr "ફિલ્ટરો ને સંચાલિત કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1298
+msgid "Filter Name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1300
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1305
+msgid "Select Dashboard to add this filter to:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1309
+msgid "Title of new Dashboard item:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1416
+msgid "Advanced Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1426
+msgid "Any of the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1427
+msgid "All the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1428
+msgid "None of the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1435
+msgid "Add condition"
+msgstr "શરત ઉમેરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1436
+msgid "and"
+msgstr "અને"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1503
+msgid "Save & New"
+msgstr "સંગ્રહો અને નવું"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1504
+msgid "Save & Close"
+msgstr "સંગ્રહો અને બંધ કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1611
+msgid ""
+"This wizard will export all data that matches the current search criteria to "
+"a CSV file.\n"
+"            You can export all data or only the fields that can be "
+"reimported after modification."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1618
+msgid "Export Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1620
+msgid "Import Compatible Export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1621
+msgid "Export all Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1624
+msgid "Export Formats"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1630
+msgid "Available fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1632
+msgid "Fields to export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1634
+msgid "Save fields list"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1648
+msgid "Remove All"
+msgstr "બધું દૂર કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1660
+msgid "Name"
+msgstr "નામ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1693
+msgid "Save as:"
+msgstr "આ રૂપમાં સાચવો:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1700
+msgid "Saved exports:"
+msgstr "સચવાયેલા નિકાસ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1714
+msgid "Old Password:"
+msgstr "જૂનું પાસવર્ડ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1719
+msgid "New Password:"
+msgstr "નવો પાસવર્ડ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1724
+msgid "Confirm Password:"
+msgstr "પાસવર્ડની પુષ્ટિ કરો:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1742
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1743
+msgid ""
+"Select a .CSV file to import. If you need a sample of file to import,\n"
+"       you should use the export tool with the \"Import Compatible\" option."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1747
+msgid "CSV File:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1750
+msgid "2. Check your file format"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1753
+msgid "Import Options"
+msgstr "આયાત વિકલ્પો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1757
+msgid "Does your file have titles?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1763
+msgid "Separator:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1765
+msgid "Delimiter:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1769
+msgid "Encoding:"
+msgstr "એનકોડીંગ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1772
+msgid "UTF-8"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1773
+msgid "Latin 1"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1776
+msgid "Lines to skip"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1776
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1803
+msgid "The import failed due to:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1805
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1812
+msgid "Activate the developper mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1814
+msgid "Version"
+msgstr "આવૃત્તિ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1815
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1816
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1817
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1819
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1820
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1822
+msgid "For more information visit"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1823
+msgid "OpenERP.com"
+msgstr ""
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 78cd13ffd97..d2f97026967 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-14 15:27+0100\n"
-"PO-Revision-Date: 2012-04-02 13:15+0000\n"
+"PO-Revision-Date: 2012-04-16 12:21+0000\n"
 "Last-Translator: Erwin <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-03 05:16+0000\n"
-"X-Generator: Launchpad (build 15052)\n"
+"X-Launchpad-Export-Date: 2012-04-17 05:23+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:172
@@ -53,7 +53,7 @@ msgstr "Ongeldige database naam"
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:483
 msgid "Backed"
-msgstr ""
+msgstr "Back-up gereed"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:484
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
new file mode 100644
index 00000000000..d51c0ca2420
--- /dev/null
+++ b/addons/web_diagram/i18n/bs.po
@@ -0,0 +1,57 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-16 15:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:11
+msgid "Diagram"
+msgstr "Dijagram"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:224
+#: addons/web_diagram/static/src/js/diagram.js:257
+msgid "Activity"
+msgstr "Aktivnost"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:289
+#: addons/web_diagram/static/src/js/diagram.js:308
+msgid "Transition"
+msgstr "Prijelaz"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:214
+#: addons/web_diagram/static/src/js/diagram.js:262
+#: addons/web_diagram/static/src/js/diagram.js:314
+msgid "Create:"
+msgstr "Kreiraj"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:231
+#: addons/web_diagram/static/src/js/diagram.js:232
+#: addons/web_diagram/static/src/js/diagram.js:296
+msgid "Open: "
+msgstr "Otvori: "
+
+#. openerp-web
+#: addons/web_diagram/static/src/xml/base_diagram.xml:5
+#: addons/web_diagram/static/src/xml/base_diagram.xml:6
+msgid "New Node"
+msgstr "Novi čvor"
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
new file mode 100644
index 00000000000..2e6f985dfaf
--- /dev/null
+++ b/addons/web_gantt/i18n/bs.po
@@ -0,0 +1,28 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-16 15:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web_gantt/static/src/js/gantt.js:11
+msgid "Gantt"
+msgstr "Gant"
+
+#. openerp-web
+#: addons/web_gantt/static/src/xml/web_gantt.xml:10
+msgid "Create"
+msgstr "Kreiraj"
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
new file mode 100644
index 00000000000..d8ca1b91203
--- /dev/null
+++ b/addons/web_graph/i18n/bs.po
@@ -0,0 +1,23 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-16 15:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Graf"
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
new file mode 100644
index 00000000000..b2c55c8d618
--- /dev/null
+++ b/addons/web_kanban/i18n/bs.po
@@ -0,0 +1,55 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-04-16 15:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-17 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:10
+msgid "Kanban"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:294
+#: addons/web_kanban/static/src/js/kanban.js:295
+msgid "Undefined"
+msgstr "Nedefinisano"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:469
+#: addons/web_kanban/static/src/js/kanban.js:470
+msgid "Are you sure you want to delete this record ?"
+msgstr "Jeste li sigurni da želite izbrisati zapis?"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:5
+msgid "Create"
+msgstr "Kreiraj"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "Show more... ("
+msgstr "Prikaži više"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "remaining)"
+msgstr "Preostalo"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:59
+msgid "</tr><tr>"
+msgstr "</tr><tr>"

From 1be2406a0534a21d1a7c6defbddf9824dcdd4b08 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 17 Apr 2012 10:30:16 +0200
Subject: [PATCH 65/90] [FIX] Fix missing modifiers on notebook page tab

bzr revid: fme@openerp.com-20120417083016-cvku8xv0bsajzy91
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 7cbffe865e5..f365abf8856 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -811,7 +811,7 @@
 <t t-name="FormRenderingNotebook">
     <div>
         <ul t-attf-class="oe_form_notebook #{classnames}">
-            <li t-foreach="pages" t-as="page">
+            <li t-foreach="pages" t-as="page" t-att-modifiers="page.modifiers">
                 <a t-attf-href="##{page.id}">
                     <t t-esc="page.string"/>
                 </a>

From b12d4bce8d0eecd08437cc403efec009c3e5f3b4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 11:18:36 +0200
Subject: [PATCH 66/90] [imp] implemented dao interface

bzr revid: nicolas.vanhoren@openerp.com-20120417091836-ej2g238h7x7firnp
---
 addons/point_of_sale/static/src/js/pos.js | 94 ++++++++++++++++-------
 1 file changed, 68 insertions(+), 26 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index d1873b1bdde..8605e8cac9c 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -36,10 +36,46 @@ openerp.point_of_sale = function(db) {
     var _t = db.web._t;
     
     var DAOInterface = {
-        
+        add_operation: function(operation) {},
+        remove_operation: function(id) {},
+        get_operations: function() {},
     };
     var LocalStorageDAO = db.web.Class.extend({
-        
+        add_operation: function(operation) {
+            var self = this;
+            return $.async_when().pipe(function() {
+                var tmp = self._get('oe_pos_operations', []);
+                var last_id = self._get('oe_pos_operations_sequence', 1);
+                tmp.push({'id': last_id, 'data': operation});
+                self._set('oe_pos_operations', tmp);
+                self._set('oe_pos_operations_sequence', last_id + 1);
+            });
+        },
+        remove_operation: function(id) {
+            var self = this;
+            return $.async_when().pipe(function() {
+                var tmp = self._get('oe_pos_operations', []);
+                tmp = _.filter(tmp, function(el) {
+                    return el.id !== id;
+                });
+                self._set('oe_pos_operations', tmp);
+            });
+        },
+        get_operations: function() {
+            var self = this;
+            return $.async_when().pipe(function() {
+                return self._get('oe_pos_operations', []);
+            });
+        },
+        _get: function(key, default_) {
+            var txt = localStorage[key];
+            if (! txt)
+                return default_;
+            return JSON.parse(txt);
+        },
+        _set: function(key, value) {
+            localStorage[key] = JSON.stringify(value);
+        },
     });
     
     var fetch = function(osvModel, fields, domain) {
@@ -59,7 +95,7 @@ openerp.point_of_sale = function(db) {
             this.flush_mutex = new $.Mutex();
             this.build_tree = _.bind(this.build_tree, this);
             this.session = session;
-            this.set({'pending_operations': [],
+            this.set({'nbr_pending_operations': 0,
                 'currency': {symbol: '$', position: 'after'},
                 'shop': {},
                 'company': {},
@@ -80,7 +116,7 @@ openerp.point_of_sale = function(db) {
             var tax_def = fetch('account.tax', ['amount', 'price_include', 'type']).then(function(result) {
                 return self.set({'taxes': result});
             });
-            $.when(cat_def, prod_def, bank_def, tax_def, this.get_app_data())
+            $.when(cat_def, prod_def, bank_def, tax_def, this.get_app_data(), this.flush())
                 .pipe(_.bind(this.build_tree, this));
         },
         get_app_data: function() {
@@ -102,10 +138,10 @@ openerp.point_of_sale = function(db) {
             }));
         },
         pushOrder: function(record) {
-            var ops = _.clone(this.get('pending_operations'));
-            ops.push(record);
-            this.set({pending_operations: ops});
-            return this.flush();
+            var self = this;
+            return this.dao.add_operation(record).pipe(function() {
+                return self.flush();
+            });
         },
         flush: function() {
             return this.flush_mutex.exec(_.bind(function() {
@@ -113,21 +149,27 @@ openerp.point_of_sale = function(db) {
             }, this));
         },
         _int_flush : function() {
-            var ops = this.get('pending_operations');
-            if (ops.length === 0)
-                return $.when();
-            var op = ops[0];
-            /* we prevent the default error handler and assume errors
-             * are a normal use case, except we stop the current iteration
-             */
-            return new db.web.Model("pos.order").get_func("create_from_ui")([op]).fail(function(unused, event) {
-                event.preventDefault();
-            }).pipe(_.bind(function() {
-                console.debug('saved 1 record');
-                var ops2 = this.get('pending_operations');
-                this.set({'pending_operations': _.without(ops2, op)});
-                return this._int_flush();
-            }, this), function() {return $.when()});
+            var self = this;
+            this.dao.get_operations().pipe(function(ops) {
+                self.set({"nbr_pending_operations": ops.length});
+                if (ops.length === 0)
+                    return $.when();
+                var op = ops[0].data;
+                var op_id = ops[0].id;
+                /* we prevent the default error handler and assume errors
+                 * are a normal use case, except we stop the current iteration
+                 */
+                return new db.web.Model("pos.order").get_func("create_from_ui")([op]).fail(function(unused, event) {
+                    event.preventDefault();
+                }).pipe(function() {
+                    console.debug('saved 1 record');
+                    self.dao.remove_operation(op_id).pipe(function() {
+                        return self._int_flush();
+                    });
+                }, function() {
+                    return $.when();
+                });
+            });
         },
         categories: {},
         build_tree: function() {
@@ -1299,7 +1341,7 @@ openerp.point_of_sale = function(db) {
                 this.synch_notification.replace($('.oe_pos_synch-notification', this.$element));
                 this.synch_notification.on_synch.add(_.bind(pos.flush, pos));
                 
-                pos.bind('change:pending_operations', this.changed_pending_operations, this);
+                pos.bind('change:nbr_pending_operations', this.changed_pending_operations, this);
                 this.changed_pending_operations();
                 
                 this.$element.find("#loggedas button").click(function() {
@@ -1323,12 +1365,12 @@ openerp.point_of_sale = function(db) {
             return qweb_template("PointOfSale")();
         },
         changed_pending_operations: function () {
-            this.synch_notification.on_change_nbr_pending(pos.get('pending_operations').length);
+            this.synch_notification.on_change_nbr_pending(pos.get('nbr_pending_operations'));
         },
         try_close: function() {
             pos.flush().then(_.bind(function() {
                 var close = _.bind(this.close, this);
-                if (pos.get('pending_operations').length > 0) {
+                if (pos.get('nbr_pending_operations') > 0) {
                     var confirm = false;
                     $(QWeb.render('pos-close-warning')).dialog({
                         resizable: false,

From 03b62d9b21283d21dcef7c4e89856e2cfef58585 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 17 Apr 2012 12:18:10 +0200
Subject: [PATCH 67/90] [FIX] base: name_search of res_partner can now handle
 properly when limit=None is passed

bzr revid: qdp-launchpad@openerp.com-20120417101810-wwijmbp06aflcebs
---
 openerp/addons/base/res/res_partner.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index c8065403148..bcbeb0f3d99 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -307,10 +307,15 @@ class res_partner(osv.osv):
         if name and operator in ('=', 'ilike', '=ilike', 'like'):
             # search on the name of the contacts and of its company
             name2 = operator == '=' and name or '%' + name + '%'
+            limit_str = ''
+            query_args = [name2]
+            if limit:
+                limit_str = ' limit %s'
+                query_args += [limit] 
             cr.execute('''SELECT partner.id FROM res_partner partner
                           LEFT JOIN res_partner company ON partner.parent_id = company.id
                           WHERE partner.name || ' (' || COALESCE(company.name,'') || ')'
-                          ''' + operator + ''' %s limit '''+str(limit), (name2,))
+                          ''' + operator + ''' %s ''' + limit_str, query_args)
             ids = map(lambda x: x[0], cr.fetchall())
             if args:
                 ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context)

From 5b89624fcf297b4a8a39cd5e2597abe63badac35 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:43:58 +0200
Subject: [PATCH 68/90] [imp] renammed some usage of instance for future
 refactoring

bzr revid: nicolas.vanhoren@openerp.com-20120417114358-ilya1z6iv0o61m6t
---
 addons/web/static/src/js/view_form.js |  2 +-
 addons/web/static/src/js/view_list.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c462ae49798..bcf3ffd2600 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1926,7 +1926,7 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
     picker: function() {
         return $.fn[this.jqueryui_object].apply(this.$input_picker, arguments);
     },
-    on_picker_select: function(text, instance) {
+    on_picker_select: function(text, instance_) {
         var date = this.picker('getDate');
         this.$input.val(date ? this.format_client(date) : '').change();
     },
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index f137bd6c211..d8ef6ecb34f 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1654,19 +1654,19 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
         var records = record instanceof Array ? record : [record];
 
         for(var i=0, length=records.length; i<length; ++i) {
-            var instance = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
-            instance.bind(null, this._onRecordEvent);
-            this._byId[instance.get('id')] = instance;
+            var instance_ = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
+            instance_.bind(null, this._onRecordEvent);
+            this._byId[instance_.get('id')] = instance_;
             if (options.at == undefined) {
-                this.records.push(instance);
+                this.records.push(instance_);
                 if (!options.silent) {
-                    this.trigger('add', this, instance, this.records.length-1);
+                    this.trigger('add', this, instance_, this.records.length-1);
                 }
             } else {
                 var insertion_index = options.at + i;
-                this.records.splice(insertion_index, 0, instance);
+                this.records.splice(insertion_index, 0, instance_);
                 if (!options.silent) {
-                    this.trigger('add', this, instance, insertion_index);
+                    this.trigger('add', this, instance_, insertion_index);
                 }
             }
             this.length++;

From e35f513f44d51a87a8437c96d2b4142060cfdbc3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:48:37 +0200
Subject: [PATCH 69/90] [imp] refactored chrome.js

bzr revid: nicolas.vanhoren@openerp.com-20120417114837-z4j94uy9f1qstbue
---
 addons/web/static/src/js/chrome.js | 104 ++++++++++++++---------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 892c86f2a92..f1d3faef367 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1,16 +1,16 @@
 /*---------------------------------------------------------
  * OpenERP Web chrome
  *---------------------------------------------------------*/
-openerp.web.chrome = function(openerp) {
-var QWeb = openerp.web.qweb,
-    _t = openerp.web._t;
+openerp.web.chrome = function(instance) {
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 
-openerp.web.Notification =  openerp.web.Widget.extend({
+instance.web.Notification =  instance.web.Widget.extend({
     template: 'Notification',
     init: function() {
         this._super.apply(this, arguments);
-        // move to openerp.web.notification
-        openerp.notification = this;
+        // move to instance.web.notification
+        instance.notification = this;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -43,13 +43,13 @@ openerp.web.Notification =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web.dialog = function(element) {
+instance.web.dialog = function(element) {
     var result = element.dialog.apply(element, _.rest(_.toArray(arguments)));
     result.dialog("widget").addClass("openerp");
     return result;
 }
 
-openerp.web.Dialog = openerp.web.Widget.extend({
+instance.web.Dialog = instance.web.Widget.extend({
     dialog_title: "",
     init: function (parent, options, content) {
         var self = this;
@@ -83,7 +83,7 @@ openerp.web.Dialog = openerp.web.Widget.extend({
         if (this.dialog_options.autoOpen) {
             this.open();
         } else {
-            openerp.web.dialog(this.$element, this.get_options());
+            instance.web.dialog(this.$element, this.get_options());
         }
     },
     get_options: function(options) {
@@ -122,7 +122,7 @@ openerp.web.Dialog = openerp.web.Widget.extend({
             this.$element.html(this.renderElement());
         }
         var o = this.get_options(options);
-        openerp.web.dialog(this.$element, o).dialog('open');
+        instance.web.dialog(this.$element, o).dialog('open');
         if (o.height === 'auto' && o.max_height) {
             this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
         }
@@ -146,7 +146,7 @@ openerp.web.Dialog = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
+instance.web.CrashManager = instance.web.CallbackEnabled.extend({
     on_rpc_error: function(error) {
         if (error.data.fault_code) {
             var split = ("" + error.data.fault_code).split('\n')[0].split(' -- ');
@@ -162,7 +162,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
         }
     },
     on_managed_error: function(error) {
-    	openerp.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
+    	instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
             title: "OpenERP " + _.str.capitalize(error.type),
             buttons: [
                 {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
@@ -172,14 +172,14 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
     on_traceback: function(error) {
         var self = this;
         var buttons = {};
-        if (openerp.connection.openerp_entreprise) {
+        if (instance.connection.openerp_entreprise) {
             buttons[_t("Send OpenERP Enterprise Report")] = function() {
                 var $this = $(this);
                 var issuename = $('#issuename').val();
                 var explanation = $('#explanation').val();
                 var remark = $('#remark').val();
                 // Call the send method from server to send mail with details
-                new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [error.data,explanation,remark,issuename]).then(function(result){
+                new instance.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [error.data,explanation,remark,issuename]).then(function(result){
                     if (result === false) {
                         alert('There was a communication error.')
                     } else {
@@ -195,7 +195,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
                 $(this).dialog("close");
             };
         }
-        var dialog = new openerp.web.Dialog(this, {
+        var dialog = new instance.web.Dialog(this, {
             title: "OpenERP " + _.str.capitalize(error.type),
             width: '80%',
             height: '50%',
@@ -203,11 +203,11 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
             min_height: '600px',
             buttons: buttons
         }).open();
-        dialog.$element.html(QWeb.render('CrashManager.error', {session: openerp.connection, error: error}));
+        dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error}));
     }
 });
 
-openerp.web.Loading = openerp.web.Widget.extend({
+instance.web.Loading = instance.web.Widget.extend({
     template: 'Loading',
     init: function(parent) {
         this._super(parent);
@@ -258,7 +258,7 @@ openerp.web.Loading = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.DatabaseManager = openerp.web.Widget.extend({
+instance.web.DatabaseManager = instance.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
         this.unblockUIFunction = $.unblockUI;
@@ -344,7 +344,7 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
      * @param {String} error.error message of the error dialog
      */
     display_error: function (error) {
-        return openerp.web.dialog($('<div>'), {
+        return instance.web.dialog($('<div>'), {
             modal: true,
             title: error.title,
             buttons: [
@@ -388,7 +388,7 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
             success: function () {
                 self.do_notify(_t("Backed"), _t("Database backed up successfully"));
             },
-            error: openerp.webclient.crashmanager.on_rpc_error,
+            error: instance.webclient.crashmanager.on_rpc_error,
             complete: function() {
                 self.unblockUI();
             }
@@ -439,7 +439,7 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.Login =  openerp.web.Widget.extend({
+instance.web.Login =  instance.web.Widget.extend({
     template: "Login",
     remember_credentials: true,
     init: function(parent) {
@@ -464,7 +464,7 @@ openerp.web.Login =  openerp.web.Widget.extend({
         self.$element.find('.oe_login_manage_db').click(function() {
             self.$element.find('.oe_login_bottom').hide();
             self.$element.find('.oe_login_pane').hide();
-            self.databasemanager = new openerp.web.DatabaseManager(self);
+            self.databasemanager = new instance.web.DatabaseManager(self);
             self.databasemanager.appendTo(self.$element);
             self.databasemanager.do_exit.add_last(function() {
                 self.databasemanager.destroy();
@@ -486,7 +486,7 @@ openerp.web.Login =  openerp.web.Widget.extend({
         });
     },
     set_db_list: function (list) {
-        this.$element.find("[name=db]").replaceWith(openerp.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}))
+        this.$element.find("[name=db]").replaceWith(instance.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}))
     },
     on_submit: function(ev) {
         if(ev) {
@@ -538,7 +538,7 @@ openerp.web.Login =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web.Menu =  openerp.web.Widget.extend({
+instance.web.Menu =  instance.web.Widget.extend({
     template: 'Menu',
     init: function() {
         this._super.apply(this, arguments);
@@ -682,7 +682,7 @@ openerp.web.Menu =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web.UserMenu =  openerp.web.Widget.extend({
+instance.web.UserMenu =  instance.web.Widget.extend({
     template: "UserMenu",
     init: function(parent) {
         this._super(parent);
@@ -707,7 +707,7 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     },
     change_password :function() {
         var self = this;
-        this.dialog = new openerp.web.Dialog(this, {
+        this.dialog = new instance.web.Dialog(this, {
             title: _t("Change Password"),
             width : 'auto'
         }).open();
@@ -721,14 +721,14 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
                         self.display_error(result);
                         return;
                     } else {
-                        openerp.webclient.on_logout();
+                        instance.webclient.on_logout();
                     }
                 });
             }
         });
     },
     display_error: function (error) {
-        return openerp.web.dialog($('<div>'), {
+        return instance.web.dialog($('<div>'), {
             modal: true,
             title: error.title,
             buttons: [
@@ -743,10 +743,10 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
             $avatar.attr('src', $avatar.data('default-src'));
             if (!self.session.uid)
                 return;
-            var func = new openerp.web.Model("res.users").get_func("read");
+            var func = new instance.web.Model("res.users").get_func("read");
             return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
                 // TODO: Show company if multicompany is in use
-                var topbar_name = _.str.sprintf("%s (%s)", res.name, openerp.connection.db, res.company_id[1]);
+                var topbar_name = _.str.sprintf("%s (%s)", res.name, instance.connection.db, res.company_id[1]);
                 self.$element.find('.oe_topbar_name').text(topbar_name);
                 var avatar_src = _.str.sprintf('%s/web/binary/image?session_id=%s&model=res.users&field=avatar&id=%s', self.session.prefix, self.session.session_id, self.session.uid);
                 $avatar.attr('src', avatar_src);
@@ -760,7 +760,7 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     shortcut_load :function(){
         var self = this,
             sc = self.session.shortcuts,
-            shortcuts_ds = new openerp.web.DataSet(this, 'ir.ui.view_sc');
+            shortcuts_ds = new instance.web.DataSet(this, 'ir.ui.view_sc');
         self.$element.find('.oe_dropdown_options a[data-menu=shortcut]').each(function() {
             $(this).parent().remove();
         });
@@ -807,8 +807,8 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     },
     on_menu_settings: function() {
         var self = this;
-        var action_manager = new openerp.web.ActionManager(this);
-        var dataset = new openerp.web.DataSet (this,'res.users',this.context);
+        var action_manager = new instance.web.ActionManager(this);
+        var dataset = new instance.web.DataSet (this,'res.users',this.context);
         dataset.call ('action_get','',function (result){
             self.rpc('/web/action/load', {action_id:result}, function(result){
                 action_manager.do_action(_.extend(result['result'], {
@@ -825,7 +825,7 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
                 }));
             });
         });
-        this.dialog = new openerp.web.Dialog(this,{
+        this.dialog = new instance.web.Dialog(this,{
             title: _t("Preferences"),
             width: '700px',
             buttons: [
@@ -855,7 +855,7 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
                 window.location = $.param.querystring(
                         window.location.href, 'debug');
             });
-            openerp.web.dialog($help, {autoOpen: true,
+            instance.web.dialog($help, {autoOpen: true,
                 modal: true, width: 960, title: _t("About")});
         });
     },
@@ -871,11 +871,11 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web.WebClient = openerp.web.Widget.extend({
+instance.web.WebClient = instance.web.Widget.extend({
     init: function(parent) {
         var self = this;
         this._super(parent);
-        openerp.webclient = this;
+        instance.webclient = this;
         this.querystring = '?' + jQuery.param.querystring();
         this._current_state = null;
     },
@@ -900,7 +900,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({
             self.menu.do_reload();
             if(self.action_manager)
                 self.action_manager.destroy();
-            self.action_manager = new openerp.web.ActionManager(self);
+            self.action_manager = new instance.web.ActionManager(self);
             self.action_manager.appendTo(self.$element.find('.oe_application'));
             self.bind_hashchange();
             var version_label = _t("OpenERP - Unsupported/Community Version");
@@ -917,7 +917,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({
         var self = this;
         this.destroy_content();
         this.show_common();
-        self.login = new openerp.web.Login(self);
+        self.login = new instance.web.Login(self);
         self.login.appendTo(self.$element);
     },
     show_application: function() {
@@ -926,10 +926,10 @@ openerp.web.WebClient = openerp.web.Widget.extend({
         this.show_common();
         self.$table = $(QWeb.render("WebClient", {}));
         self.$element.append(self.$table);
-        self.menu = new openerp.web.Menu(self);
+        self.menu = new instance.web.Menu(self);
         self.menu.replace(this.$element.find('.oe_menu_placeholder'));
         self.menu.on_action.add(this.proxy('on_menu_action'));
-        self.user_menu = new openerp.web.UserMenu(self);
+        self.user_menu = new instance.web.UserMenu(self);
         self.user_menu.replace(this.$element.find('.oe_user_menu_placeholder'));
         self.user_menu.on_menu_logout.add(this.proxy('on_logout'));
         self.user_menu.on_action.add(this.proxy('on_menu_action'));
@@ -937,8 +937,8 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     show_common: function() {
         var self = this;
         if (!this.crashmanager) {
-            this.crashmanager =  new openerp.web.CrashManager();
-            openerp.connection.on_rpc_error.add(this.crashmanager.on_rpc_error);
+            this.crashmanager =  new instance.web.CrashManager();
+            instance.connection.on_rpc_error.add(this.crashmanager.on_rpc_error);
             window.onerror = function (message, file, line) {
                 self.crashmanager.on_traceback({
                     type: _t("Client Error"),
@@ -947,9 +947,9 @@ openerp.web.WebClient = openerp.web.Widget.extend({
                 });
             }
         }
-        this.notification = new openerp.web.Notification(this);
+        this.notification = new instance.web.Notification(this);
         this.notification.appendTo(this.$element);
-        this.loading = new openerp.web.Loading(this);
+        this.loading = new instance.web.Loading(this);
         this.loading.appendTo(this.$element);
     },
     destroy_content: function() {
@@ -961,7 +961,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     do_reload: function() {
         var self = this;
         return this.session.session_reload().pipe(function () {
-            openerp.connection.load_modules(true).pipe(
+            instance.connection.load_modules(true).pipe(
                 self.menu.proxy('do_reload')); });
 
     },
@@ -1025,14 +1025,14 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.EmbeddedClient = openerp.web.Widget.extend({
+instance.web.EmbeddedClient = instance.web.Widget.extend({
     template: 'EmptyComponent',
     init: function(parent, action_id, options) {
         this._super(parent);
         // TODO take the xmlid of a action instead of its id 
         this.action_id = action_id;
         this.options = options || {};
-        this.am = new openerp.web.ActionManager(this);
+        this.am = new instance.web.ActionManager(this);
     },
     start: function() {
         var self = this;
@@ -1052,7 +1052,7 @@ openerp.web.EmbeddedClient = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.embed = function (origin, dbname, login, key, action, options) {
+instance.web.embed = function (origin, dbname, login, key, action, options) {
     $('head').append($('<link>', {
         'rel': 'stylesheet',
         'type': 'text/css',
@@ -1063,9 +1063,9 @@ openerp.web.embed = function (origin, dbname, login, key, action, options) {
         var sc = document.getElementsByTagName('script');
         currentScript = sc[sc.length-1];
     }
-    openerp.connection.session_bind(origin).then(function () {
-        openerp.connection.session_authenticate(dbname, login, key, true).then(function () {
-            var client = new openerp.web.EmbeddedClient(null, action, options);
+    instance.connection.session_bind(origin).then(function () {
+        instance.connection.session_authenticate(dbname, login, key, true).then(function () {
+            var client = new instance.web.EmbeddedClient(null, action, options);
             client.insertAfter(currentScript);
         });
     });

From 1d488be821bc603bc796525480d9393fdf0d9dd7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:52:47 +0200
Subject: [PATCH 70/90] [imp] refactored corelib.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115247-an5dj09s7k1a2su0
---
 addons/web/static/src/js/corelib.js | 126 ++++++++++++++--------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 2da804c3d2c..5475f4ad53c 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-openerp.web.corelib = function(openerp) {
+openerp.web.corelib = function(instance) {
 
 /**
  * Improved John Resig's inheritance, based on:
@@ -39,7 +39,7 @@ openerp.web.corelib = function(openerp) {
  *
  * Example:
  *
- * var Person = openerp.web.Class.extend({
+ * var Person = instance.web.Class.extend({
  *  init: function(isDancing){
  *     this.dancing = isDancing;
  *   },
@@ -75,14 +75,14 @@ openerp.web.corelib = function(openerp) {
     var initializing = false,
         fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
     // The web Class implementation (does nothing)
-    openerp.web.Class = function(){};
+    instance.web.Class = function(){};
 
     /**
      * Subclass an existing class
      *
      * @param {Object} prop class-level properties (class attributes and instance methods) to set on the new class
      */
-    openerp.web.Class.extend = function() {
+    instance.web.Class.extend = function() {
         var _super = this.prototype;
         // Support mixins arguments
         var args = _.toArray(arguments);
@@ -180,7 +180,7 @@ openerp.web.corelib = function(openerp) {
  * When an object is destroyed, all its children are destroyed too releasing
  * any resource they could have reserved before.
  */
-openerp.web.ParentedMixin = {
+instance.web.ParentedMixin = {
     __parentedMixin : true,
     init: function() {
         this.__parentedDestroyed = false;
@@ -253,7 +253,7 @@ openerp.web.ParentedMixin = {
  * events is done in EventDispatcherMixin.
  *
  */
-openerp.web.Events = openerp.web.Class.extend({
+instance.web.Events = instance.web.Class.extend({
 
     on : function(events, callback, context) {
         var ev;
@@ -324,11 +324,11 @@ openerp.web.Events = openerp.web.Class.extend({
     }
 });
 
-openerp.web.EventDispatcherMixin = _.extend({}, openerp.web.ParentedMixin, {
+instance.web.EventDispatcherMixin = _.extend({}, instance.web.ParentedMixin, {
     __eventDispatcherMixin: true,
     init: function() {
-        openerp.web.ParentedMixin.init.call(this);
-        this.__edispatcherEvents = new openerp.web.Events();
+        instance.web.ParentedMixin.init.call(this);
+        this.__edispatcherEvents = new instance.web.Events();
         this.__edispatcherRegisteredEvents = [];
     },
     on: function(events, dest, func) {
@@ -369,13 +369,13 @@ openerp.web.EventDispatcherMixin = _.extend({}, openerp.web.ParentedMixin, {
             debugger;
         }
         this.__edispatcherEvents.off();
-        openerp.web.ParentedMixin.destroy.call(this);
+        instance.web.ParentedMixin.destroy.call(this);
     }
 });
 
-openerp.web.GetterSetterMixin = _.extend({}, openerp.web.EventDispatcherMixin, {
+instance.web.GetterSetterMixin = _.extend({}, instance.web.EventDispatcherMixin, {
     init: function() {
-        openerp.web.EventDispatcherMixin.init.call(this);
+        instance.web.EventDispatcherMixin.init.call(this);
         this.__getterSetterInternalMap = {};
     },
     set: function(map) {
@@ -400,9 +400,9 @@ openerp.web.GetterSetterMixin = _.extend({}, openerp.web.EventDispatcherMixin, {
     }
 });
 
-openerp.web.CallbackEnabledMixin = _.extend({}, openerp.web.GetterSetterMixin, {
+instance.web.CallbackEnabledMixin = _.extend({}, instance.web.GetterSetterMixin, {
     init: function() {
-        openerp.web.GetterSetterMixin.init.call(this);
+        instance.web.GetterSetterMixin.init.call(this);
         var self = this;
         var callback_maker = function(obj, name, method) {
             var callback = function() {
@@ -421,7 +421,7 @@ openerp.web.CallbackEnabledMixin = _.extend({}, openerp.web.GetterSetterMixin, {
                         r = result;
                     }
                     // TODO special value to stop the chain
-                    // openerp.web.callback_stop
+                    // instance.web.callback_stop
                 }
                 return r;
             };
@@ -500,7 +500,7 @@ openerp.web.CallbackEnabledMixin = _.extend({}, openerp.web.GetterSetterMixin, {
     }
 });
 
-openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
+instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     /**
      * Tag name when creating a default $element.
      * @type string
@@ -509,10 +509,10 @@ openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
     /**
      * Constructs the widget and sets its parent if a parent is given.
      *
-     * @constructs openerp.web.Widget
-     * @extends openerp.web.CallbackEnabled
+     * @constructs instance.web.Widget
+     * @extends instance.web.CallbackEnabled
      *
-     * @param {openerp.web.Widget} parent Binds the current instance to the given Widget instance.
+     * @param {instance.web.Widget} parent Binds the current instance to the given Widget instance.
      * When that widget is destroyed by calling destroy(), the current instance will be
      * destroyed too. Can be null.
      * @param {String} element_id Deprecated. Sets the element_id. Only useful when you want
@@ -521,7 +521,7 @@ openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
      * for new components this argument should not be provided any more.
      */
     init: function(parent) {
-        openerp.web.CallbackEnabledMixin.init.call(this);
+        instance.web.CallbackEnabledMixin.init.call(this);
         this.$element = $(document.createElement(this.tagName));
         this.setParent(parent);
     },
@@ -535,7 +535,7 @@ openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
         if(this.$element != null) {
             this.$element.remove();
         }
-        openerp.web.GetterSetterMixin.destroy.call(this);
+        instance.web.GetterSetterMixin.destroy.call(this);
     },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
@@ -616,9 +616,9 @@ openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
 
 // Classes
 
-openerp.web.CallbackEnabled = openerp.web.Class.extend(openerp.web.CallbackEnabledMixin, {
+instance.web.CallbackEnabled = instance.web.Class.extend(instance.web.CallbackEnabledMixin, {
     init: function() {
-        openerp.web.CallbackEnabledMixin.init.call(this);
+        instance.web.CallbackEnabledMixin.init.call(this);
     }
 });
 
@@ -637,7 +637,7 @@ openerp.web.CallbackEnabled = openerp.web.Class.extend(openerp.web.CallbackEnabl
  *
  * Here is a sample child class:
  *
- * MyWidget = openerp.base.Widget.extend({
+ * MyWidget = instance.base.Widget.extend({
  *     // the name of the QWeb template to use for rendering
  *     template: "MyQWebTemplate",
  *
@@ -670,7 +670,7 @@ openerp.web.CallbackEnabled = openerp.web.Class.extend(openerp.web.CallbackEnabl
  *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
-openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
+instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -681,10 +681,10 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
     /**
      * Constructs the widget and sets its parent if a parent is given.
      *
-     * @constructs openerp.web.Widget
-     * @extends openerp.web.CallbackEnabled
+     * @constructs instance.web.Widget
+     * @extends instance.web.CallbackEnabled
      *
-     * @param {openerp.web.Widget} parent Binds the current instance to the given Widget instance.
+     * @param {instance.web.Widget} parent Binds the current instance to the given Widget instance.
      * When that widget is destroyed by calling destroy(), the current instance will be
      * destroyed too. Can be null.
      * @param {String} element_id Deprecated. Sets the element_id. Only useful when you want
@@ -693,8 +693,8 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
      * for new components this argument should not be provided any more.
      */
     init: function(parent) {
-        openerp.web.WidgetMixin.init.call(this,parent);
-        this.session = openerp.connection;
+        instance.web.WidgetMixin.init.call(this,parent);
+        this.session = instance.connection;
     },
     /**
      * Renders the element. The default implementation renders the widget using QWeb,
@@ -704,7 +704,7 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
     renderElement: function() {
         var rendered = null;
         if (this.template)
-            rendered = openerp.web.qweb.render(this.template, {widget: this});
+            rendered = instance.web.qweb.render(this.template, {widget: this});
         if (_.str.trim(rendered)) {
             var elem = $(rendered);
             this.$element.replaceWith(elem);
@@ -737,7 +737,7 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
-        openerp.connection.rpc(url, data). then(function() {
+        instance.connection.rpc(url, data). then(function() {
             if (!self.isDestroyed())
                 def.resolve.apply(def, arguments);
         }, function() {
@@ -748,7 +748,7 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
     }
 });
 
-openerp.web.Registry = openerp.web.Class.extend({
+instance.web.Registry = instance.web.Class.extend({
     /**
      * Stores a mapping of arbitrary key (strings) to object paths (as strings
      * as well).
@@ -757,11 +757,11 @@ openerp.web.Registry = openerp.web.Class.extend({
      * object, even if those objects have been overloaded/replaced after the
      * registry was created.
      *
-     * An object path is simply a dotted name from the openerp root to the
-     * object pointed to (e.g. ``"openerp.web.Connection"`` for an OpenERP
+     * An object path is simply a dotted name from the instance root to the
+     * object pointed to (e.g. ``"instance.web.Connection"`` for an OpenERP
      * connection object).
      *
-     * @constructs openerp.web.Registry
+     * @constructs instance.web.Registry
      * @param {Object} mapping a mapping of keys to object-paths
      */
     init: function (mapping) {
@@ -785,7 +785,7 @@ openerp.web.Registry = openerp.web.Class.extend({
             return null;
         }
 
-        var object_match = openerp;
+        var object_match = instance;
         var path = path_string.split('.');
         // ignore first section
         for(var i=1; i<path.length; ++i) {
@@ -838,7 +838,7 @@ openerp.web.Registry = openerp.web.Class.extend({
      *
      * @param {String} key
      * @param {String} object_path fully qualified dotted object path
-     * @returns {openerp.web.Registry} itself
+     * @returns {instance.web.Registry} itself
      */
     add: function (key, object_path) {
         this.map[key] = object_path;
@@ -854,7 +854,7 @@ openerp.web.Registry = openerp.web.Class.extend({
      * @param {Object} [mapping={}] a mapping of keys to object-paths
      */
     extend: function (mapping) {
-        var child = new openerp.web.Registry(mapping);
+        var child = new instance.web.Registry(mapping);
         child.parent = this;
         return child;
     },
@@ -867,10 +867,10 @@ openerp.web.Registry = openerp.web.Class.extend({
     }
 });
 
-openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Connection# */{
+instance.web.Connection = instance.web.CallbackEnabled.extend( /** @lends instance.web.Connection# */{
     /**
-     * @constructs openerp.web.Connection
-     * @extends openerp.web.CallbackEnabled
+     * @constructs instance.web.Connection
+     * @extends instance.web.CallbackEnabled
      *
      * @param {String} [server] JSON-RPC endpoint hostname
      * @param {String} [port] JSON-RPC endpoint port
@@ -880,7 +880,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.server = null;
         this.debug = ($.deparam($.param.querystring()).debug != undefined);
         // TODO: session store in cookie should be optional
-        this.name = openerp._session_id;
+        this.name = instance._session_id;
         this.qweb_mutex = new $.Mutex();
     },
     session_bind: function(origin) {
@@ -888,7 +888,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.origin = origin ? _.str.rtrim(origin,'/') : window_origin;
         this.prefix = this.origin;
         this.server = this.origin; // keep chs happy
-        openerp.web.qweb.default_dict['_s'] = this.origin;
+        instance.web.qweb.default_dict['_s'] = this.origin;
         this.rpc_function = (this.origin == window_origin) ? this.rpc_json : this.rpc_jsonp;
         this.session_id = false;
         this.uid = false;
@@ -896,7 +896,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.user_context= {};
         this.db = false;
         this.openerp_entreprise = false;
-        this.module_list = openerp._modules.slice();
+        this.module_list = instance._modules.slice();
         this.module_loaded = {};
         _(this.module_list).each(function (mod) {
             self.module_loaded[mod] = true;
@@ -1069,7 +1069,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         try {
             var ctx = this.test_eval_contexts(source.contexts);
             if (!_.isEqual(ctx, expected.context)) {
-                openerp.webclient.notification.warn('Context mismatch, report to xmo',
+                instance.webclient.notification.warn('Context mismatch, report to xmo',
                     _.str.sprintf(match_template, {
                         source: JSON.stringify(source.contexts),
                         local: JSON.stringify(ctx),
@@ -1077,7 +1077,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                     }), true);
             }
         } catch (e) {
-            openerp.webclient.notification.warn('Context fail, report to xmo',
+            instance.webclient.notification.warn('Context fail, report to xmo',
                 _.str.sprintf(fail_template, {
                     error: e.message,
                     source: JSON.stringify(source.contexts)
@@ -1087,7 +1087,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         try {
             var dom = this.test_eval_domains(source.domains, this.test_eval_get_context());
             if (!_.isEqual(dom, expected.domain)) {
-                openerp.webclient.notification.warn('Domains mismatch, report to xmo',
+                instance.webclient.notification.warn('Domains mismatch, report to xmo',
                     _.str.sprintf(match_template, {
                         source: JSON.stringify(source.domains),
                         local: JSON.stringify(dom),
@@ -1095,7 +1095,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                     }), true);
             }
         } catch (e) {
-            openerp.webclient.notification.warn('Domain fail, report to xmo',
+            instance.webclient.notification.warn('Domain fail, report to xmo',
                 _.str.sprintf(fail_template, {
                     error: e.message,
                     source: JSON.stringify(source.domains)
@@ -1105,7 +1105,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         try {
             var groups = this.test_eval_groupby(source.group_by_seq);
             if (!_.isEqual(groups, expected.group_by)) {
-                openerp.webclient.notification.warn('GroupBy mismatch, report to xmo',
+                instance.webclient.notification.warn('GroupBy mismatch, report to xmo',
                     _.str.sprintf(match_template, {
                         source: JSON.stringify(source.group_by_seq),
                         local: JSON.stringify(groups),
@@ -1113,7 +1113,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                     }), true);
             }
         } catch (e) {
-            openerp.webclient.notification.warn('GroupBy fail, report to xmo',
+            instance.webclient.notification.warn('GroupBy fail, report to xmo',
                 _.str.sprintf(fail_template, {
                     error: e.message,
                     source: JSON.stringify(source.group_by_seq)
@@ -1369,7 +1369,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         // TODO: session store in cookie should be optional
         this.session_id = this.get_cookie('session_id');
         return this.session_reload().pipe(function(result) {
-            var modules = openerp._modules.join(',');
+            var modules = instance._modules.join(',');
             var deferred = self.rpc('/web/webclient/qweblist', {mods: modules}).pipe(self.do_load_qweb);
             if(self.session_is_valid()) {
                 return deferred.pipe(function() { return self.load_modules(); });
@@ -1491,7 +1491,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                     self.rpc('/web/webclient/csslist', {mods: to_load}, self.do_load_css),
                     self.rpc('/web/webclient/qweblist', {mods: to_load}).pipe(self.do_load_qweb),
                     self.rpc('/web/webclient/translations', params).pipe(function(trans) {
-                        openerp.web._t.database.set_bundle(trans);
+                        instance.web._t.database.set_bundle(trans);
                         var file_list = ["/web/static/lib/datejs/globalization/" + lang.replace("_", "-") + ".js"];
                         return self.rpc('/web/webclient/jslist', {mods: to_load}).pipe(function(files) {
                             return self.do_load_js(file_list.concat(files));
@@ -1553,7 +1553,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             self.qweb_mutex.exec(function() {
                 return self.rpc('/web/proxy/load', {path: file}).pipe(function(xml) {
                     if (!xml) { return; }
-                    openerp.web.qweb.add_template(_.str.trim(xml));
+                    instance.web.qweb.add_template(_.str.trim(xml));
                 });
             });
         });
@@ -1564,10 +1564,10 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             var mod = this.module_list[j];
             if(this.module_loaded[mod])
                 continue;
-            openerp[mod] = {};
+            instance[mod] = {};
             // init module mod
-            if(openerp._openerp[mod] != undefined) {
-                openerp._openerp[mod](openerp);
+            if(instance._openerp[mod] != undefined) {
+                instance._openerp[mod](instance);
                 this.module_loaded[mod] = true;
             }
         }
@@ -1687,10 +1687,10 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
     }
 });
 
-openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.web.TranslationDataBase# */{
+instance.web.TranslationDataBase = instance.web.Class.extend(/** @lends instance.web.TranslationDataBase# */{
     /**
-     * @constructs openerp.web.TranslationDataBase
-     * @extends openerp.web.Class
+     * @constructs instance.web.TranslationDataBase
+     * @extends instance.web.Class
      */
     init: function() {
         this.db = {};
@@ -1741,9 +1741,9 @@ openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.we
 });
 
 /**
- * @deprecated use :class:`openerp.web.Widget`
+ * @deprecated use :class:`instance.web.Widget`
  */
-openerp.web.OldWidget = openerp.web.Widget.extend({
+instance.web.OldWidget = instance.web.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent);
         this.element_id = element_id;
@@ -1762,7 +1762,7 @@ openerp.web.OldWidget = openerp.web.Widget.extend({
     },
     render: function (additional) {
         if (this.template)
-            return openerp.web.qweb.render(this.template, _.extend({widget: this}, additional || {}));
+            return instance.web.qweb.render(this.template, _.extend({widget: this}, additional || {}));
         return null;
     }
 });

From 62373eafe9ff2da83e6a50e22a90105bcac7918c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:53:56 +0200
Subject: [PATCH 71/90] [imp] refactored coresetup.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115356-vl4sna742qrtgpg0
---
 addons/web/static/src/js/coresetup.js | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index a68a7bb3d7e..86040302668 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -9,10 +9,10 @@ if (!console.debug) {
     console.debug = console.log;
 }
 
-openerp.web.coresetup = function(openerp) {
+openerp.web.coresetup = function(instance) {
 
 /** Configure default qweb */
-openerp.web._t = new openerp.web.TranslationDataBase().build_translation_function();
+instance.web._t = new instance.web.TranslationDataBase().build_translation_function();
 /**
  * Lazy translation function, only performs the translation when actually
  * printed (e.g. inserted into a template)
@@ -24,16 +24,16 @@ openerp.web._t = new openerp.web.TranslationDataBase().build_translation_functio
  * @param {String} s string to translate
  * @returns {Object} lazy translation object
  */
-openerp.web._lt = function (s) {
-    return {toString: function () { return openerp.web._t(s); }}
+instance.web._lt = function (s) {
+    return {toString: function () { return instance.web._t(s); }}
 };
-openerp.web.qweb = new QWeb2.Engine();
-openerp.web.qweb.debug = ($.deparam($.param.querystring()).debug != undefined);
-openerp.web.qweb.default_dict = {
+instance.web.qweb = new QWeb2.Engine();
+instance.web.qweb.debug = ($.deparam($.param.querystring()).debug != undefined);
+instance.web.qweb.default_dict = {
     '_' : _,
-    '_t' : openerp.web._t
+    '_t' : instance.web._t
 };
-openerp.web.qweb.preprocess_node = function() {
+instance.web.qweb.preprocess_node = function() {
     // Note that 'this' is the Qweb Node
     switch (this.node.nodeType) {
         case 3:
@@ -47,7 +47,7 @@ openerp.web.qweb.preprocess_node = function() {
             if (ts.length === 0) {
                 return;
             }
-            var tr = openerp.web._t(ts);
+            var tr = instance.web._t(ts);
             if (tr !== ts) {
                 this.node.data = tr;
             }
@@ -57,7 +57,7 @@ openerp.web.qweb.preprocess_node = function() {
             var attr, attrs = ['label', 'title', 'alt'];
             while (attr = attrs.pop()) {
                 if (this.attributes[attr]) {
-                    this.attributes[attr] = openerp.web._t(this.attributes[attr]);
+                    this.attributes[attr] = instance.web._t(this.attributes[attr]);
                 }
             }
     }
@@ -99,8 +99,8 @@ $.Mutex = (function() {
 })();
 
 /** Setup default connection */
-openerp.connection = new openerp.web.Connection();
-openerp.web.qweb.default_dict['__debug__'] = openerp.connection.debug;
+instance.connection = new instance.web.Connection();
+instance.web.qweb.default_dict['__debug__'] = instance.connection.debug;
 
 $.async_when = function() {
     var async = false;
@@ -131,7 +131,7 @@ $.async_when = function() {
 // special tweak for the web client
 var old_async_when = $.async_when;
 $.async_when = function() {
-	if (openerp.connection.synch)
+	if (instance.connection.synch)
 		return $.when.apply(this, arguments);
 	else
 		return old_async_when.apply(this, arguments);

From 0cccd29dcc76f8376d9400141f20e70d668937b9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:55:33 +0200
Subject: [PATCH 72/90] [imp] refactored data.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115533-w0wfyon5fn1kk5jn
---
 addons/web/static/src/js/data.js | 76 ++++++++++++++++----------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index d9cfc5c4002..4f18a4c53d9 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -1,5 +1,5 @@
 
-openerp.web.data = function(openerp) {
+openerp.web.data = function(instance) {
 
 /**
  * Serializes the sort criterion array of a dataset into a form which can be
@@ -8,7 +8,7 @@ openerp.web.data = function(openerp) {
  * @param {Array} criterion array of fields, from first to last criteria, prefixed with '-' for reverse sorting
  * @returns {String} SQL-like sorting string (``ORDER BY``) clause
  */
-openerp.web.serialize_sort = function (criterion) {
+instance.web.serialize_sort = function (criterion) {
     return _.map(criterion,
         function (criteria) {
             if (criteria[0] === '-') {
@@ -18,7 +18,7 @@ openerp.web.serialize_sort = function (criterion) {
         }).join(', ');
 };
 
-openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{
+instance.web.DataGroup =  instance.web.OldWidget.extend( /** @lends instance.web.DataGroup# */{
     /**
      * Management interface between views and grouped collections of OpenERP
      * records.
@@ -26,13 +26,13 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
      * The root DataGroup is instantiated with the relevant information
      * (a session, a model, a domain, a context and a group_by sequence), the
      * domain and context may be empty. It is then interacted with via
-     * :js:func:`~openerp.web.DataGroup.list`, which is used to read the
+     * :js:func:`~instance.web.DataGroup.list`, which is used to read the
      * content of the current grouping level.
      *
-     * @constructs openerp.web.DataGroup
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.DataGroup
+     * @extends instance.web.OldWidget
      *
-     * @param {openerp.web.OldWidget} parent widget
+     * @param {instance.web.OldWidget} parent widget
      * @param {String} model name of the model managed by this DataGroup
      * @param {Array} domain search domain for this DataGroup
      * @param {Object} context context of the DataGroup's searches
@@ -43,9 +43,9 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
         this._super(parent, null);
         if (group_by) {
             if (group_by.length || context['group_by_no_leaf']) {
-                return new openerp.web.ContainerDataGroup( this, model, domain, context, group_by, level);
+                return new instance.web.ContainerDataGroup( this, model, domain, context, group_by, level);
             } else {
-                return new openerp.web.GrouplessDataGroup( this, model, domain, context, level);
+                return new instance.web.GrouplessDataGroup( this, model, domain, context, level);
             }
         }
 
@@ -57,11 +57,11 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
     },
     cls: 'DataGroup'
 });
-openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends openerp.web.ContainerDataGroup# */ {
+instance.web.ContainerDataGroup = instance.web.DataGroup.extend( /** @lends instance.web.ContainerDataGroup# */ {
     /**
      *
-     * @constructs openerp.web.ContainerDataGroup
-     * @extends openerp.web.DataGroup
+     * @constructs instance.web.ContainerDataGroup
+     * @extends instance.web.DataGroup
      *
      * @param session
      * @param model
@@ -146,7 +146,7 @@ openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends opener
             domain: this.domain,
             fields: _.uniq(this.group_by.concat(fields)),
             group_by_fields: this.group_by,
-            sort: openerp.web.serialize_sort(this.sort)
+            sort: instance.web.serialize_sort(this.sort)
         }, function () { }).then(function (response) {
             var data_groups = _(response).map(
                     _.bind(self.transform_group, self));
@@ -186,7 +186,7 @@ openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends opener
             ifGroups(_(group_records).map(function (group) {
                 var child_context = _.extend({}, self.context, group.__context);
                 return _.extend(
-                    new openerp.web.DataGroup(
+                    new instance.web.DataGroup(
                         self, self.model, group.__domain,
                         child_context, child_context.group_by,
                         self.level + 1),
@@ -195,11 +195,11 @@ openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends opener
         });
     }
 });
-openerp.web.GrouplessDataGroup = openerp.web.DataGroup.extend( /** @lends openerp.web.GrouplessDataGroup# */ {
+instance.web.GrouplessDataGroup = instance.web.DataGroup.extend( /** @lends instance.web.GrouplessDataGroup# */ {
     /**
      *
-     * @constructs openerp.web.GrouplessDataGroup
-     * @extends openerp.web.DataGroup
+     * @constructs instance.web.GrouplessDataGroup
+     * @extends instance.web.DataGroup
      *
      * @param session
      * @param model
@@ -212,17 +212,17 @@ openerp.web.GrouplessDataGroup = openerp.web.DataGroup.extend( /** @lends opener
     },
     list: function (fields, ifGroups, ifRecords) {
         ifRecords(_.extend(
-            new openerp.web.DataSetSearch(this, this.model),
+            new instance.web.DataSetSearch(this, this.model),
             {domain: this.domain, context: this.context, _sort: this.sort}));
     }
 });
-openerp.web.StaticDataGroup = openerp.web.GrouplessDataGroup.extend( /** @lends openerp.web.StaticDataGroup# */ {
+instance.web.StaticDataGroup = instance.web.GrouplessDataGroup.extend( /** @lends instance.web.StaticDataGroup# */ {
     /**
      * A specialization of groupless data groups, relying on a single static
      * dataset as its records provider.
      *
-     * @constructs openerp.web.StaticDataGroup
-     * @extends openerp.web.GrouplessDataGroup
+     * @constructs instance.web.StaticDataGroup
+     * @extends instance.web.GrouplessDataGroup
      * @param {openep.web.DataSetStatic} dataset a static dataset backing the groups
      */
     init: function (dataset) {
@@ -233,13 +233,13 @@ openerp.web.StaticDataGroup = openerp.web.GrouplessDataGroup.extend( /** @lends
     }
 });
 
-openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.DataSet# */{
+instance.web.DataSet =  instance.web.OldWidget.extend( /** @lends instance.web.DataSet# */{
     /**
      * DateaManagement interface between views and the collection of selected
      * OpenERP records (represents the view's state?)
      *
-     * @constructs openerp.web.DataSet
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.DataSet
+     * @extends instance.web.OldWidget
      *
      * @param {String} model the OpenERP model this dataset will manage
      */
@@ -494,7 +494,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
     },
     get_context: function(request_context) {
         if (request_context) {
-            return new openerp.web.CompoundContext(this.context, request_context);
+            return new instance.web.CompoundContext(this.context, request_context);
         }
         return this.context;
     },
@@ -513,7 +513,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      */
     sort: function (field, force_reverse) {
         if (!field) {
-            return openerp.web.serialize_sort(this._sort);
+            return instance.web.serialize_sort(this._sort);
         }
         var reverse = force_reverse || (this._sort[0] === field);
         this._sort.splice.apply(
@@ -530,7 +530,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
     	this.ids = n_ids;
     },
 });
-openerp.web.DataSetStatic =  openerp.web.DataSet.extend({
+instance.web.DataSetStatic =  instance.web.DataSet.extend({
     init: function(parent, model, context, ids) {
         this._super(parent, model, context);
         // all local records
@@ -560,10 +560,10 @@ openerp.web.DataSetStatic =  openerp.web.DataSet.extend({
         this.set_ids(_.without.apply(null, [this.ids].concat(ids)));
     }
 });
-openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.DataSetSearch */{
+instance.web.DataSetSearch =  instance.web.DataSet.extend(/** @lends instance.web.DataSetSearch */{
     /**
-     * @constructs openerp.web.DataSetSearch
-     * @extends openerp.web.DataSet
+     * @constructs instance.web.DataSetSearch
+     * @extends instance.web.DataSet
      *
      * @param {Object} parent
      * @param {String} model
@@ -612,7 +612,7 @@ openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.D
     },
     get_domain: function (other_domain) {
         if (other_domain) {
-            return new openerp.web.CompoundDomain(this.domain, other_domain);
+            return new instance.web.CompoundDomain(this.domain, other_domain);
         }
         return this.domain;
     },
@@ -635,7 +635,7 @@ openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.D
         return this._super();
     }
 });
-openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
+instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
     virtual_id_prefix: "one2many_v_id_",
     debug_mode: true,
     init: function() {
@@ -800,9 +800,9 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
         this.on_change();
     },
 });
-openerp.web.BufferedDataSet.virtual_id_regex = /^one2many_v_id_.*$/;
+instance.web.BufferedDataSet.virtual_id_regex = /^one2many_v_id_.*$/;
 
-openerp.web.ProxyDataSet = openerp.web.DataSetSearch.extend({
+instance.web.ProxyDataSet = instance.web.DataSetSearch.extend({
     init: function() {
         this._super.apply(this, arguments);
         this.create_function = null;
@@ -848,13 +848,13 @@ openerp.web.ProxyDataSet = openerp.web.DataSetSearch.extend({
     on_unlink: function(ids) {}
 });
 
-openerp.web.Model = openerp.web.CallbackEnabled.extend({
+instance.web.Model = instance.web.CallbackEnabled.extend({
     init: function(model_name) {
         this._super();
         this.model_name = model_name;
     },
     rpc: function() {
-        var c = openerp.connection;
+        var c = instance.connection;
         return c.rpc.apply(c, arguments);
     },
     /*
@@ -876,7 +876,7 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({
     }
 });
 
-openerp.web.CompoundContext = openerp.web.Class.extend({
+instance.web.CompoundContext = instance.web.Class.extend({
     init: function () {
         this.__ref = "compound_context";
         this.__contexts = [];
@@ -899,7 +899,7 @@ openerp.web.CompoundContext = openerp.web.Class.extend({
     }
 });
 
-openerp.web.CompoundDomain = openerp.web.Class.extend({
+instance.web.CompoundDomain = instance.web.Class.extend({
     init: function () {
         this.__ref = "compound_domain";
         this.__domains = [];

From ac4b895a41a7f10a8d151a2cdf81107dfb04e57a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:56:37 +0200
Subject: [PATCH 73/90] [imp] refactored data_export.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115637-533ls7fxw0okk7ly
---
 addons/web/static/src/js/data_export.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 3d15a4e3607..ebe82ddb4b4 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -1,14 +1,14 @@
-openerp.web.data_export = function(openerp) {
-var QWeb = openerp.web.qweb,
-      _t = openerp.web._t;
-openerp.web.DataExport = openerp.web.Dialog.extend({
+openerp.web.data_export = function(instance) {
+var QWeb = instance.web.qweb,
+      _t = instance.web._t;
+instance.web.DataExport = instance.web.Dialog.extend({
     template: 'ExportTreeView',
     dialog_title: {toString: function () { return _t("Export Data"); }},
     init: function(parent, dataset) {
         this._super(parent);
         this.records = {};
         this.dataset = dataset;
-        this.exports = new openerp.web.DataSetSearch(
+        this.exports = new instance.web.DataSetSearch(
             this, 'ir.exports', this.dataset.get_context());
     },
     start: function() {

From d5ae31540905b1e4c4eab5156d0182ddb2dd408d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:57:26 +0200
Subject: [PATCH 74/90] [imp] refactored data_import.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115726-5zwzwyp1lzdjxwh7
---
 addons/web/static/src/js/data_import.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index 3054a7784c4..30f9323f723 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -1,6 +1,6 @@
-openerp.web.data_import = function(openerp) {
-var QWeb = openerp.web.qweb,
-    _t = openerp.web._t;
+openerp.web.data_import = function(instance) {
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 /**
  * Safari does not deal well at all with raw JSON data being returned. As a
  * result, we're going to cheat by using a pseudo-jsonp: instead of getting
@@ -29,7 +29,7 @@ function jsonp(form, attributes, callback) {
     $(form).ajaxSubmit(attributes);
 }
 
-openerp.web.DataImport = openerp.web.Dialog.extend({
+instance.web.DataImport = instance.web.Dialog.extend({
     template: 'ImportDataView',
     dialog_title: {toString: function () { return _t("Import Data"); }},
     init: function(parent, dataset){
@@ -79,10 +79,10 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         this.$element.delegate('fieldset legend', 'click', function() {
             $(this).parent().toggleClass('oe-closed');
         });
-        this.ready.push(new openerp.web.DataSet(this, this.model).call(
+        this.ready.push(new instance.web.DataSet(this, this.model).call(
             'fields_get', [], function (fields) {
                 self.graft_fields(fields);
-                self.ready.push(new openerp.web.DataSet(self, self.model)
+                self.ready.push(new instance.web.DataSet(self, self.model)
                         .default_get(_.pluck(self.fields, 'id')).then(function (fields) {
                     _.each(fields, function(val, key) {
                         if (val) {
@@ -140,7 +140,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
                 f.fields = [];
                 // only fetch sub-fields to a depth of 2 levels
                 if (level < 2) {
-                    self.ready.push(new openerp.web.DataSet(self, field.relation).call(
+                    self.ready.push(new instance.web.DataSet(self, field.relation).call(
                         'fields_get', [], function (fields) {
                             self.graft_fields(fields, f, level+1);
                     }));
@@ -151,7 +151,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         });
     },
     toggle_import_button: function (newstate) {
-    	openerp.web.dialog(this.$element, 'widget')
+    	instance.web.dialog(this.$element, 'widget')
                 .find('.oe-dialog-import-button')
                 .button('option', 'disabled', !newstate);
     },

From abd76257a9cdd858d6f8a00218428a93e6e4be1a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:58:05 +0200
Subject: [PATCH 75/90] [imp] refactored dates.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115805-z74z6sqdzwkvj0kw
---
 addons/web/static/src/js/dates.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/dates.js b/addons/web/static/src/js/dates.js
index d61223113f8..3db48c8412a 100644
--- a/addons/web/static/src/js/dates.js
+++ b/addons/web/static/src/js/dates.js
@@ -1,5 +1,5 @@
 
-openerp.web.dates = function(openerp) {
+openerp.web.dates = function(instance) {
 
 /**
  * Converts a string to a Date javascript object using OpenERP's
@@ -11,7 +11,7 @@ openerp.web.dates = function(openerp) {
  * @param {String} str A string representing a datetime.
  * @returns {Date}
  */
-openerp.web.str_to_datetime = function(str) {
+instance.web.str_to_datetime = function(str) {
     if(!str) {
         return str;
     }
@@ -38,7 +38,7 @@ openerp.web.str_to_datetime = function(str) {
  * @param {String} str A string representing a date.
  * @returns {Date}
  */
-openerp.web.str_to_date = function(str) {
+instance.web.str_to_date = function(str) {
     if(!str) {
         return str;
     }
@@ -65,7 +65,7 @@ openerp.web.str_to_date = function(str) {
  * @param {String} str A string representing a time.
  * @returns {Date}
  */
-openerp.web.str_to_time = function(str) {
+instance.web.str_to_time = function(str) {
     if(!str) {
         return str;
     }
@@ -104,7 +104,7 @@ var zpad = function(str, size) {
  * @param {Date} obj
  * @returns {String} A string representing a datetime.
  */
-openerp.web.datetime_to_str = function(obj) {
+instance.web.datetime_to_str = function(obj) {
     if (!obj) {
         return false;
     }
@@ -124,7 +124,7 @@ openerp.web.datetime_to_str = function(obj) {
  * @param {Date} obj
  * @returns {String} A string representing a date.
  */
-openerp.web.date_to_str = function(obj) {
+instance.web.date_to_str = function(obj) {
     if (!obj) {
         return false;
     }
@@ -143,7 +143,7 @@ openerp.web.date_to_str = function(obj) {
  * @param {Date} obj
  * @returns {String} A string representing a time.
  */
-openerp.web.time_to_str = function(obj) {
+instance.web.time_to_str = function(obj) {
     if (!obj) {
         return false;
     }

From 753fac33ced1574c231d4cb3a693b47eba1f3c49 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:59:16 +0200
Subject: [PATCH 76/90] [imp] refactored formats.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115916-k57s4rh3wmbajzyz
---
 addons/web/static/src/js/formats.js | 82 ++++++++++++++---------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 53863e63e97..107a923b625 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -1,6 +1,6 @@
 
-openerp.web.formats = function(openerp) {
-var _t = openerp.web._t;
+openerp.web.formats = function(instance) {
+var _t = instance.web._t;
 
 /**
  * Intersperses ``separator`` in ``str`` at the positions indicated by
@@ -23,7 +23,7 @@ var _t = openerp.web._t;
  * @param {String} separator
  * @returns {String}
  */
-openerp.web.intersperse = function (str, indices, separator) {
+instance.web.intersperse = function (str, indices, separator) {
     separator = separator || '';
     var result = [], last = str.length;
 
@@ -55,10 +55,10 @@ openerp.web.intersperse = function (str, indices, separator) {
  * @param {String} num
  * @returns {String}
  */
-openerp.web.insert_thousand_seps = function (num) {
+instance.web.insert_thousand_seps = function (num) {
     var negative = num[0] === '-';
     num = (negative ? num.slice(1) : num);
-    return (negative ? '-' : '') + openerp.web.intersperse(
+    return (negative ? '-' : '') + instance.web.intersperse(
         num, _t.database.parameters.grouping, _t.database.parameters.thousands_sep);
 };
 
@@ -69,7 +69,7 @@ openerp.web.insert_thousand_seps = function (num) {
  *
  * @param {String} value original format
  */
-openerp.web.strip_raw_chars = function (value) {
+instance.web.strip_raw_chars = function (value) {
     var isletter = /[a-zA-Z]/, output = [];
     for(var index=0; index < value.length; ++index) {
         var character = value[index];
@@ -81,7 +81,7 @@ openerp.web.strip_raw_chars = function (value) {
     return output.join('');
 };
 var normalize_format = function (format) {
-    return Date.normalizeFormat(openerp.web.strip_raw_chars(format));
+    return Date.normalizeFormat(instance.web.strip_raw_chars(format));
 };
 /**
  * Formats a single atomic value based on a field descriptor
@@ -93,7 +93,7 @@ var normalize_format = function (format) {
  * @param {Object} [descriptor.digits] used for the formatting of floats
  * @param {String} [value_if_empty=''] returned if the ``value`` argument is considered empty
  */
-openerp.web.format_value = function (value, descriptor, value_if_empty) {
+instance.web.format_value = function (value, descriptor, value_if_empty) {
     // If NaN value, display as with a `false` (empty cell)
     if (typeof value === 'number' && isNaN(value)) {
         value = false;
@@ -115,12 +115,12 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
         case 'id':
             return value.toString();
         case 'integer':
-            return openerp.web.insert_thousand_seps(
+            return instance.web.insert_thousand_seps(
                 _.str.sprintf('%d', value));
         case 'float':
             var precision = descriptor.digits ? descriptor.digits[1] : 2;
             var formatted = _.str.sprintf('%.' + precision + 'f', value).split('.');
-            formatted[0] = openerp.web.insert_thousand_seps(formatted[0]);
+            formatted[0] = instance.web.insert_thousand_seps(formatted[0]);
             return formatted.join(l10n.decimal_point);
         case 'float_time':
             var pattern = '%02d:%02d';
@@ -136,17 +136,17 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
             return value[1];
         case 'datetime':
             if (typeof(value) == "string")
-                value = openerp.web.auto_str_to_date(value);
+                value = instance.web.auto_str_to_date(value);
 
             return value.toString(normalize_format(l10n.date_format)
                         + ' ' + normalize_format(l10n.time_format));
         case 'date':
             if (typeof(value) == "string")
-                value = openerp.web.auto_str_to_date(value);
+                value = instance.web.auto_str_to_date(value);
             return value.toString(normalize_format(l10n.date_format));
         case 'time':
             if (typeof(value) == "string")
-                value = openerp.web.auto_str_to_date(value);
+                value = instance.web.auto_str_to_date(value);
             return value.toString(normalize_format(l10n.time_format));
         case 'selection': case 'statusbar':
             // Each choice is [value, label]
@@ -163,7 +163,7 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
     }
 };
 
-openerp.web.parse_value = function (value, descriptor, value_if_empty) {
+instance.web.parse_value = function (value, descriptor, value_if_empty) {
     var date_pattern = normalize_format(_t.database.parameters.date_format),
         time_pattern = normalize_format(_t.database.parameters.time_format);
     switch (value) {
@@ -176,7 +176,7 @@ openerp.web.parse_value = function (value, descriptor, value_if_empty) {
             var tmp;
             do {
                 tmp = value;
-                value = value.replace(openerp.web._t.database.parameters.thousands_sep, "");
+                value = value.replace(instance.web._t.database.parameters.thousands_sep, "");
             } while(tmp !== value);
             tmp = Number(value);
             if (isNaN(tmp))
@@ -190,9 +190,9 @@ openerp.web.parse_value = function (value, descriptor, value_if_empty) {
             var tmp2 = value;
             do {
                 tmp = tmp2;
-                tmp2 = tmp.replace(openerp.web._t.database.parameters.thousands_sep, "");
+                tmp2 = tmp.replace(instance.web._t.database.parameters.thousands_sep, "");
             } while(tmp !== tmp2);
-            var reformatted_value = tmp.replace(openerp.web._t.database.parameters.decimal_point, ".");
+            var reformatted_value = tmp.replace(instance.web._t.database.parameters.decimal_point, ".");
             var parsed = Number(reformatted_value);
             if (isNaN(parsed))
                 throw new Error(value + " is not a correct float");
@@ -205,62 +205,62 @@ openerp.web.parse_value = function (value, descriptor, value_if_empty) {
             }
             var float_time_pair = value.split(":");
             if (float_time_pair.length != 2)
-                return factor * openerp.web.parse_value(value, {type: "float"});
-            var hours = openerp.web.parse_value(float_time_pair[0], {type: "integer"});
-            var minutes = openerp.web.parse_value(float_time_pair[1], {type: "integer"});
+                return factor * instance.web.parse_value(value, {type: "float"});
+            var hours = instance.web.parse_value(float_time_pair[0], {type: "integer"});
+            var minutes = instance.web.parse_value(float_time_pair[1], {type: "integer"});
             return factor * (hours + (minutes / 60));
         case 'progressbar':
-            return openerp.web.parse_value(value, {type: "float"});
+            return instance.web.parse_value(value, {type: "float"});
         case 'datetime':
             var datetime = Date.parseExact(
                     value, (date_pattern + ' ' + time_pattern));
             if (datetime !== null)
-                return openerp.web.datetime_to_str(datetime);
+                return instance.web.datetime_to_str(datetime);
             datetime = Date.parse(value);
             if (datetime !== null)
-                return openerp.web.datetime_to_str(datetime);
+                return instance.web.datetime_to_str(datetime);
             throw new Error(value + " is not a valid datetime");
         case 'date':
             var date = Date.parseExact(value, date_pattern);
             if (date !== null)
-                return openerp.web.date_to_str(date);
+                return instance.web.date_to_str(date);
             date = Date.parse(value);
             if (date !== null)
-                return openerp.web.date_to_str(date);
+                return instance.web.date_to_str(date);
             throw new Error(value + " is not a valid date");
         case 'time':
             var time = Date.parseExact(value, time_pattern);
             if (time !== null)
-                return openerp.web.time_to_str(time);
+                return instance.web.time_to_str(time);
             time = Date.parse(value);
             if (time !== null)
-                return openerp.web.time_to_str(time);
+                return instance.web.time_to_str(time);
             throw new Error(value + " is not a valid time");
     }
     return value;
 };
 
-openerp.web.auto_str_to_date = function(value, type) {
+instance.web.auto_str_to_date = function(value, type) {
     try {
-        return openerp.web.str_to_datetime(value);
+        return instance.web.str_to_datetime(value);
     } catch(e) {}
     try {
-        return openerp.web.str_to_date(value);
+        return instance.web.str_to_date(value);
     } catch(e) {}
     try {
-        return openerp.web.str_to_time(value);
+        return instance.web.str_to_time(value);
     } catch(e) {}
     throw new Error("'" + value + "' is not a valid date, datetime nor time");
 };
 
-openerp.web.auto_date_to_str = function(value, type) {
+instance.web.auto_date_to_str = function(value, type) {
     switch(type) {
         case 'datetime':
-            return openerp.web.datetime_to_str(value);
+            return instance.web.datetime_to_str(value);
         case 'date':
-            return openerp.web.date_to_str(value);
+            return instance.web.date_to_str(value);
         case 'time':
-            return openerp.web.time_to_str(value);
+            return instance.web.time_to_str(value);
         default:
             throw new Error(type + " is not convertible to date, datetime nor time");
     }
@@ -290,7 +290,7 @@ openerp.web.auto_date_to_str = function(value, type) {
  * @param {Number} [options.id] current record's id
  *
  */
-openerp.web.format_cell = function (row_data, column, options) {
+instance.web.format_cell = function (row_data, column, options) {
     options = options || {};
     var attrs = {};
     if (options.process_modifiers !== false) {
@@ -303,9 +303,9 @@ openerp.web.format_cell = function (row_data, column, options) {
             '<img src="<%-prefix%>/web/static/src/img/icons/<%-icon%>.png" alt="<%-alt%>"/>' +
             '</button>', {
                 title: column.string || '',
-                additional_attributes: isNaN(row_data["id"].value) && openerp.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ?
+                additional_attributes: isNaN(row_data["id"].value) && instance.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ?
                     'disabled="disabled" class="oe-listview-button-disabled"' : '',
-                prefix: openerp.connection.prefix,
+                prefix: instance.connection.prefix,
                 icon: column.icon,
                 alt: column.string || ''
             });
@@ -320,11 +320,11 @@ openerp.web.format_cell = function (row_data, column, options) {
                  row_data[column.id].value ? 'checked="checked"' : '');
     case "binary":
         var text = _t("Download"),
-            download_url = _.str.sprintf('/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d', openerp.connection.session_id, options.model, column.id, options.id);
+            download_url = _.str.sprintf('/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d', instance.connection.session_id, options.model, column.id, options.id);
         if (column.filename) {
             download_url += '&filename_field=' + column.filename;
             if (row_data[column.filename]) {
-                text = _.str.sprintf(_t("Download \"%s\""), openerp.web.format_value(
+                text = _.str.sprintf(_t("Download \"%s\""), instance.web.format_value(
                         row_data[column.filename].value, {type: 'char'}));
             }
         }
@@ -340,7 +340,7 @@ openerp.web.format_cell = function (row_data, column, options) {
             });
     }
 
-    return _.escape(openerp.web.format_value(
+    return _.escape(instance.web.format_value(
             row_data[column.id].value, column, options.value_if_empty));
 }
 

From 827964936f77b1edcc81d011986932bdd908ee1e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:02:10 +0200
Subject: [PATCH 77/90] [imp] refactored search.js

bzr revid: nicolas.vanhoren@openerp.com-20120417120210-kejvstgamtpufbeq
---
 addons/web/static/src/js/search.js | 262 ++++++++++++++---------------
 1 file changed, 131 insertions(+), 131 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 6e1026b48a1..18ac6b78de5 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1,7 +1,7 @@
-openerp.web.search = function(openerp) {
-var QWeb = openerp.web.qweb,
-      _t =  openerp.web._t,
-     _lt = openerp.web._lt;
+openerp.web.search = function(instance) {
+var QWeb = instance.web.qweb,
+      _t =  instance.web._t,
+     _lt = instance.web._lt;
 _.mixin({
     sum: function (obj) { return _.reduce(obj, function (a, b) { return a + b; }, 0); }
 });
@@ -70,11 +70,11 @@ _.extend(VS.model.SearchFacet.prototype, {
     }
 });
 
-openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.SearchView# */{
+instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.SearchView# */{
     template: "SearchView",
     /**
-     * @constructs openerp.web.SearchView
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.SearchView
+     * @extends instance.web.OldWidget
      *
      * @param parent
      * @param element_id
@@ -178,7 +178,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
 
         var running_count = 0;
         // get total filters count
-        var is_group = function (i) { return i instanceof openerp.web.search.FilterGroup; };
+        var is_group = function (i) { return i instanceof instance.web.search.FilterGroup; };
         var filters_count = _(this.controls).chain()
             .flatten()
             .filter(is_group)
@@ -212,12 +212,12 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             name: _t("Custom Filters"),
             filters: _.map(this.custom_filters, function (filter) {
                 // FIXME: handling of ``disabled`` being set
-                var f = new openerp.web.search.Filter({attrs: {
+                var f = new instance.web.search.Filter({attrs: {
                     string: filter.name,
                     context: filter.context,
                     domain: filter.domain
                 }}, self);
-                return new openerp.web.search.FilterGroup([f], self);
+                return new instance.web.search.FilterGroup([f], self);
             }),
             length: 3
         });
@@ -225,7 +225,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
         return $.when(
             this.render_column(col1, $('<div>').appendTo($filters)),
             this.render_column(col2, $('<div>').appendTo($filters)),
-            (new openerp.web.search.Advanced(this).appendTo($drawer)));
+            (new instance.web.search.Advanced(this).appendTo($drawer)));
     },
     render_column: function (column, $el) {
         return $.when.apply(null, _(column).map(function (group) {
@@ -314,10 +314,10 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      * @param {VS.model.SearchFacet} options.model facet object to render
      */
     make_visualsearch_facet: function (options) {
-        return new openerp.web.search.FilterGroupFacet(options);
+        return new instance.web.search.FilterGroupFacet(options);
 
-//        if (options.model.get('field') instanceof openerp.web.search.FilterGroup) {
-//            return new openerp.web.search.FilterGroupFacet(options);
+//        if (options.model.get('field') instanceof instance.web.search.FilterGroup) {
+//            return new instance.web.search.FilterGroupFacet(options);
 //        }
 //        return new VS.ui.SearchFacet(options);
     },
@@ -363,7 +363,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
         var filters = [];
         _.each(items, function (item) {
             if (filters.length && item.tag !== 'filter') {
-                group.push(new openerp.web.search.FilterGroup(filters, this));
+                group.push(new instance.web.search.FilterGroup(filters, this));
                 filters = [];
             }
 
@@ -371,7 +371,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             case 'separator': case 'newline':
                 break;
             case 'filter':
-                filters.push(new openerp.web.search.Filter(item, this));
+                filters.push(new instance.web.search.Filter(item, this));
                 break;
             case 'group':
                 self.make_widgets(item.children, fields, item.attrs.string);
@@ -385,7 +385,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
         }, this);
 
         if (filters.length) {
-            group.push(new openerp.web.search.FilterGroup(filters, this));
+            group.push(new instance.web.search.FilterGroup(filters, this));
         }
     },
     /**
@@ -394,10 +394,10 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      *
      * @param {Object} item fields_view_get node for the field
      * @param {Object} field fields_get result for the field
-     * @returns openerp.web.search.Field
+     * @returns instance.web.search.Field
      */
     make_field: function (item, field) {
-        var obj = openerp.web.search.fields.get_any( [item.attrs.widget, field.type]);
+        var obj = instance.web.search.fields.get_any( [item.attrs.widget, field.type]);
         if(obj) {
             return new (obj) (item, field, this);
         } else {
@@ -460,11 +460,11 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             break;
         case 'save_filter':
             var data = this.build_search_data();
-            var context = new openerp.web.CompoundContext();
+            var context = new instance.web.CompoundContext();
             _.each(data.contexts, function(x) {
                 context.add(x);
             });
-            var domain = new openerp.web.CompoundDomain();
+            var domain = new instance.web.CompoundDomain();
             _.each(data.domains, function(x) {
                 domain.add(x);
             });
@@ -472,7 +472,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             context.add({"group_by": groupbys});
             var dial_html = QWeb.render("SearchView.managed-filters.add");
             var $dial = $(dial_html);
-            openerp.web.dialog($dial, {
+            instance.web.dialog($dial, {
                 modal: true,
                 title: _t("Filter Entry"),
                 buttons: [
@@ -525,13 +525,13 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
     on_add_to_dashboard: function() {
         this.$element.find(".oe_search-view-filters-management")[0].selectedIndex = 0;
         var self = this,
-            menu = openerp.webclient.menu,
+            menu = instance.webclient.menu,
             $dialog = $(QWeb.render("SearchView.add_to_dashboard", {
                 dashboards : menu.data.data.children,
                 selected_menu_id : menu.$element.find('a.active').data('menu')
             }));
         $dialog.find('input').val(this.fields_view.name);
-        openerp.web.dialog($dialog, {
+        instance.web.dialog($dialog, {
             modal: true,
             title: _t("Add to Dashboard"),
             buttons: [
@@ -543,8 +543,8 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
                     var menu_id = $(this).find("select").val(),
                         title = $(this).find("input").val(),
                         data = self.build_search_data(),
-                        context = new openerp.web.CompoundContext(),
-                        domain = new openerp.web.CompoundDomain();
+                        context = new instance.web.CompoundContext(),
+                        domain = new instance.web.CompoundDomain();
                     _.each(data.contexts, function(x) {
                         context.add(x);
                     });
@@ -573,10 +573,10 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      * Performs the search view collection of widget data.
      *
      * If the collection went well (all fields are valid), then triggers
-     * :js:func:`openerp.web.SearchView.on_search`.
+     * :js:func:`instance.web.SearchView.on_search`.
      *
      * If at least one field failed its validation, triggers
-     * :js:func:`openerp.web.SearchView.on_invalid` instead.
+     * :js:func:`instance.web.SearchView.on_invalid` instead.
      *
      * @param e jQuery event object coming from the "Search" button
      */
@@ -599,7 +599,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
                     groupbys.push.apply(groupbys, group_by);
                 }
             } catch (e) {
-                if (e instanceof openerp.web.search.Invalid) {
+                if (e instanceof instance.web.search.Invalid) {
                     errors.push(e);
                 } else {
                     throw e;
@@ -648,9 +648,9 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
 });
 
 /** @namespace */
-openerp.web.search = {};
+instance.web.search = {};
 
-openerp.web.search.FilterGroupFacet = VS.ui.SearchFacet.extend({
+instance.web.search.FilterGroupFacet = VS.ui.SearchFacet.extend({
     events: _.extend({
         'click': 'selectFacet'
     }, VS.ui.SearchFacet.prototype.events),
@@ -682,30 +682,30 @@ openerp.web.search.FilterGroupFacet = VS.ui.SearchFacet.extend({
     }
 });
 /**
- * Registry of search fields, called by :js:class:`openerp.web.SearchView` to
+ * Registry of search fields, called by :js:class:`instance.web.SearchView` to
  * find and instantiate its field widgets.
  */
-openerp.web.search.fields = new openerp.web.Registry({
-    'char': 'openerp.web.search.CharField',
-    'text': 'openerp.web.search.CharField',
-    'boolean': 'openerp.web.search.BooleanField',
-    'integer': 'openerp.web.search.IntegerField',
-    'id': 'openerp.web.search.IntegerField',
-    'float': 'openerp.web.search.FloatField',
-    'selection': 'openerp.web.search.SelectionField',
-    'datetime': 'openerp.web.search.DateTimeField',
-    'date': 'openerp.web.search.DateField',
-    'many2one': 'openerp.web.search.ManyToOneField',
-    'many2many': 'openerp.web.search.CharField',
-    'one2many': 'openerp.web.search.CharField'
+instance.web.search.fields = new instance.web.Registry({
+    'char': 'instance.web.search.CharField',
+    'text': 'instance.web.search.CharField',
+    'boolean': 'instance.web.search.BooleanField',
+    'integer': 'instance.web.search.IntegerField',
+    'id': 'instance.web.search.IntegerField',
+    'float': 'instance.web.search.FloatField',
+    'selection': 'instance.web.search.SelectionField',
+    'datetime': 'instance.web.search.DateTimeField',
+    'date': 'instance.web.search.DateField',
+    'many2one': 'instance.web.search.ManyToOneField',
+    'many2many': 'instance.web.search.CharField',
+    'one2many': 'instance.web.search.CharField'
 });
-openerp.web.search.Invalid = openerp.web.Class.extend( /** @lends openerp.web.search.Invalid# */{
+instance.web.search.Invalid = instance.web.Class.extend( /** @lends instance.web.search.Invalid# */{
     /**
      * Exception thrown by search widgets when they hold invalid values,
      * which they can not return when asked.
      *
-     * @constructs openerp.web.search.Invalid
-     * @extends openerp.web.Class
+     * @constructs instance.web.search.Invalid
+     * @extends instance.web.Class
      *
      * @param field the name of the field holding an invalid value
      * @param value the invalid value
@@ -723,13 +723,13 @@ openerp.web.search.Invalid = openerp.web.Class.extend( /** @lends openerp.web.se
         );
     }
 });
-openerp.web.search.Widget = openerp.web.OldWidget.extend( /** @lends openerp.web.search.Widget# */{
+instance.web.search.Widget = instance.web.OldWidget.extend( /** @lends instance.web.search.Widget# */{
     template: null,
     /**
      * Root class of all search widgets
      *
-     * @constructs openerp.web.search.Widget
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.search.Widget
+     * @extends instance.web.OldWidget
      *
      * @param view the ancestor view of this widget
      */
@@ -738,14 +738,14 @@ openerp.web.search.Widget = openerp.web.OldWidget.extend( /** @lends openerp.web
         this.view = view;
     }
 });
-openerp.web.search.add_expand_listener = function($root) {
+instance.web.search.add_expand_listener = function($root) {
     $root.find('a.searchview_group_string').click(function (e) {
         $root.toggleClass('folded expanded');
         e.stopPropagation();
         e.preventDefault();
     });
 };
-openerp.web.search.Group = openerp.web.search.Widget.extend({
+instance.web.search.Group = instance.web.search.Widget.extend({
     template: 'SearchView.group',
     init: function (view_section, view, fields) {
         this._super(view);
@@ -755,10 +755,10 @@ openerp.web.search.Group = openerp.web.search.Widget.extend({
     }
 });
 
-openerp.web.search.Input = openerp.web.search.Widget.extend( /** @lends openerp.web.search.Input# */{
+instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instance.web.search.Input# */{
     /**
-     * @constructs openerp.web.search.Input
-     * @extends openerp.web.search.Widget
+     * @constructs instance.web.search.Input
+     * @extends instance.web.search.Widget
      *
      * @param view
      */
@@ -784,7 +784,7 @@ openerp.web.search.Input = openerp.web.search.Widget.extend( /** @lends openerp.
      * they apply to this widget, or null if they don't.
      *
      * This default implementation will try calling
-     * :js:func:`openerp.web.search.Input#facet_for` if the widget's name
+     * :js:func:`instance.web.search.Input#facet_for` if the widget's name
      * matches the input key
      *
      * @param {Object} defaults
@@ -820,17 +820,17 @@ openerp.web.search.Input = openerp.web.search.Widget.extend( /** @lends openerp.
         this.attrs = attrs;
     }
 });
-openerp.web.search.FilterGroup = openerp.web.search.Input.extend(/** @lends openerp.web.search.FilterGroup# */{
+instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends instance.web.search.FilterGroup# */{
     template: 'SearchView.filters',
     /**
      * Inclusive group of filters, creates a continuous "button" with clickable
      * sections (the normal display for filters is to be a self-contained button)
      *
-     * @constructs openerp.web.search.FilterGroup
-     * @extends openerp.web.search.Input
+     * @constructs instance.web.search.FilterGroup
+     * @extends instance.web.search.Input
      *
-     * @param {Array<openerp.web.search.Filter>} filters elements of the group
-     * @param {openerp.web.SearchView} view view in which the filters are contained
+     * @param {Array<instance.web.search.Filter>} filters elements of the group
+     * @param {instance.web.SearchView} view view in which the filters are contained
      */
     init: function (filters, view) {
         this._super(view);
@@ -868,7 +868,7 @@ openerp.web.search.FilterGroup = openerp.web.search.Input.extend(/** @lends open
 
         if (!contexts.length) { return; }
         if (contexts.length === 1) { return contexts[0]; }
-        return _.extend(new openerp.web.CompoundContext, {
+        return _.extend(new instance.web.CompoundContext, {
             __contexts: contexts
         });
     },
@@ -901,7 +901,7 @@ openerp.web.search.FilterGroup = openerp.web.search.Input.extend(/** @lends open
         for (var i=domains.length; --i;) {
             domains.unshift(['|']);
         }
-        return _.extend(new openerp.web.CompoundDomain(), {
+        return _.extend(new instance.web.CompoundDomain(), {
             __domains: domains
         });
     },
@@ -945,7 +945,7 @@ openerp.web.search.FilterGroup = openerp.web.search.Input.extend(/** @lends open
         });
     }
 });
-openerp.web.search.Filter = openerp.web.search.Input.extend(/** @lends openerp.web.search.Filter# */{
+instance.web.search.Filter = instance.web.search.Input.extend(/** @lends instance.web.search.Filter# */{
     template: 'SearchView.filter',
     /**
      * Implementation of the OpenERP filters (button with a context and/or
@@ -955,8 +955,8 @@ openerp.web.search.Filter = openerp.web.search.Input.extend(/** @lends openerp.w
      * domains and contexts, converting between facets and filters) is
      * performed by the filter group.
      *
-     * @constructs openerp.web.search.Filter
-     * @extends openerp.web.search.Input
+     * @constructs instance.web.search.Filter
+     * @extends instance.web.search.Input
      *
      * @param node
      * @param view
@@ -969,12 +969,12 @@ openerp.web.search.Filter = openerp.web.search.Input.extend(/** @lends openerp.w
     get_context: function () { },
     get_domain: function () { },
 });
-openerp.web.search.Field = openerp.web.search.Input.extend( /** @lends openerp.web.search.Field# */ {
+instance.web.search.Field = instance.web.search.Input.extend( /** @lends instance.web.search.Field# */ {
     template: 'SearchView.field',
     default_operator: '=',
     /**
-     * @constructs openerp.web.search.Field
-     * @extends openerp.web.search.Input
+     * @constructs instance.web.search.Field
+     * @extends instance.web.search.Input
      *
      * @param view_section
      * @param field
@@ -1005,7 +1005,7 @@ openerp.web.search.Field = openerp.web.search.Input.extend( /** @lends openerp.w
         if (!(has_value && context)) {
             return;
         }
-        return new openerp.web.CompoundContext(context)
+        return new instance.web.CompoundContext(context)
                 .set_eval_context({self: val});
     },
     get_groupby: function () { },
@@ -1036,7 +1036,7 @@ openerp.web.search.Field = openerp.web.search.Input.extend( /** @lends openerp.w
                 this.attrs.operator || this.default_operator,
                 facet);
         }
-        return new openerp.web.CompoundDomain(domain)
+        return new instance.web.CompoundDomain(domain)
                 .set_eval_context({self: val});
     }
 });
@@ -1048,9 +1048,9 @@ openerp.web.search.Field = openerp.web.search.Input.extend( /** @lends openerp.w
  * * The Javascript and the HTML values are identical (strings)
  *
  * @class
- * @extends openerp.web.search.Field
+ * @extends instance.web.search.Field
  */
-openerp.web.search.CharField = openerp.web.search.Field.extend( /** @lends openerp.web.search.CharField# */ {
+instance.web.search.CharField = instance.web.search.Field.extend( /** @lends instance.web.search.CharField# */ {
     default_operator: 'ilike',
     complete: function (value) {
         if (_.isEmpty(value)) { return $.when(null); }
@@ -1066,7 +1066,7 @@ openerp.web.search.CharField = openerp.web.search.Field.extend( /** @lends opene
         }]);
     }
 });
-openerp.web.search.NumberField = openerp.web.search.Field.extend(/** @lends openerp.web.search.NumberField# */{
+instance.web.search.NumberField = instance.web.search.Field.extend(/** @lends instance.web.search.NumberField# */{
     get_value: function () {
         if (!this.$element.val()) {
             return null;
@@ -1075,7 +1075,7 @@ openerp.web.search.NumberField = openerp.web.search.Field.extend(/** @lends open
           check = Number(this.$element.val());
         if (isNaN(val) || val !== check) {
             this.$element.addClass('error');
-            throw new openerp.web.search.Invalid(
+            throw new instance.web.search.Invalid(
                 this.attrs.name, this.$element.val(), this.error_message);
         }
         this.$element.removeClass('error');
@@ -1084,13 +1084,13 @@ openerp.web.search.NumberField = openerp.web.search.Field.extend(/** @lends open
 });
 /**
  * @class
- * @extends openerp.web.search.NumberField
+ * @extends instance.web.search.NumberField
  */
-openerp.web.search.IntegerField = openerp.web.search.NumberField.extend(/** @lends openerp.web.search.IntegerField# */{
+instance.web.search.IntegerField = instance.web.search.NumberField.extend(/** @lends instance.web.search.IntegerField# */{
     error_message: _t("not a valid integer"),
     parse: function (value) {
         try {
-            return openerp.web.parse_value(value, {'widget': 'integer'});
+            return instance.web.parse_value(value, {'widget': 'integer'});
         } catch (e) {
             return NaN;
         }
@@ -1098,13 +1098,13 @@ openerp.web.search.IntegerField = openerp.web.search.NumberField.extend(/** @len
 });
 /**
  * @class
- * @extends openerp.web.search.NumberField
+ * @extends instance.web.search.NumberField
  */
-openerp.web.search.FloatField = openerp.web.search.NumberField.extend(/** @lends openerp.web.search.FloatField# */{
+instance.web.search.FloatField = instance.web.search.NumberField.extend(/** @lends instance.web.search.FloatField# */{
     error_message: _t("not a valid number"),
     parse: function (value) {
         try {
-            return openerp.web.parse_value(value, {'widget': 'float'});
+            return instance.web.parse_value(value, {'widget': 'float'});
         } catch (e) {
             return NaN;
         }
@@ -1112,9 +1112,9 @@ openerp.web.search.FloatField = openerp.web.search.NumberField.extend(/** @lends
 });
 /**
  * @class
- * @extends openerp.web.search.Field
+ * @extends instance.web.search.Field
  */
-openerp.web.search.SelectionField = openerp.web.search.Field.extend(/** @lends openerp.web.search.SelectionField# */{
+instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends instance.web.search.SelectionField# */{
     // This implementation is a basic <select> field, but it may have to be
     // altered to be more in line with the GTK client, which uses a combo box
     // (~ jquery.autocomplete):
@@ -1171,10 +1171,10 @@ openerp.web.search.SelectionField = openerp.web.search.Field.extend(/** @lends o
         return facet.get('json');
     }
 });
-openerp.web.search.BooleanField = openerp.web.search.SelectionField.extend(/** @lends openerp.web.search.BooleanField# */{
+instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** @lends instance.web.search.BooleanField# */{
     /**
-     * @constructs openerp.web.search.BooleanField
-     * @extends openerp.web.search.BooleanField
+     * @constructs instance.web.search.BooleanField
+     * @extends instance.web.search.BooleanField
      */
     init: function () {
         this._super.apply(this, arguments);
@@ -1193,16 +1193,16 @@ openerp.web.search.BooleanField = openerp.web.search.SelectionField.extend(/** @
 });
 /**
  * @class
- * @extends openerp.web.search.DateField
+ * @extends instance.web.search.DateField
  */
-openerp.web.search.DateField = openerp.web.search.Field.extend(/** @lends openerp.web.search.DateField# */{
+instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{
     get_value: function (facet) {
-        return openerp.web.date_to_str(facet.get('json'));
+        return instance.web.date_to_str(facet.get('json'));
     },
     complete: function (needle) {
         var d = Date.parse(needle);
         if (!d) { return $.when(null); }
-        var value = openerp.web.format_value(d, this.attrs);
+        var value = instance.web.format_value(d, this.attrs);
         var label = _.str.sprintf(_.str.escapeHTML(
             _t("Search %(field)s at: %(value)s")), {
                 field: '<em>' + this.attrs.string + '</em>',
@@ -1225,17 +1225,17 @@ openerp.web.search.DateField = openerp.web.search.Field.extend(/** @lends opener
  *   spanning the whole day selected by the date widget
  *
  * @class
- * @extends openerp.web.DateField
+ * @extends instance.web.DateField
  */
-openerp.web.search.DateTimeField = openerp.web.search.DateField.extend(/** @lends openerp.web.search.DateTimeField# */{
+instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{
     get_value: function (facet) {
-        return openerp.web.datetime_to_str(facet.get('json'));
+        return instance.web.datetime_to_str(facet.get('json'));
     }
 });
-openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
+instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
     init: function (view_section, field, view) {
         this._super(view_section, field, view);
-        this.model = new openerp.web.Model(this.attrs.relation);
+        this.model = new instance.web.Model(this.attrs.relation);
     },
     complete: function (needle) {
         var self = this;
@@ -1289,7 +1289,7 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
     }
 });
 
-openerp.web.search.Advanced = openerp.web.search.Input.extend({
+instance.web.search.Advanced = instance.web.search.Input.extend({
     template: 'SearchView.advanced',
     start: function () {
         var self = this;
@@ -1314,7 +1314,7 @@ openerp.web.search.Advanced = openerp.web.search.Input.extend({
         });
     },
     append_proposition: function () {
-        return (new openerp.web.search.ExtendedSearchProposition(this, this.fields))
+        return (new instance.web.search.ExtendedSearchProposition(this, this.fields))
             .appendTo(this.$element.find('ul'));
     },
     commit_search: function () {
@@ -1323,14 +1323,14 @@ openerp.web.search.Advanced = openerp.web.search.Input.extend({
         var children = this.getChildren(),
             domain = _.invoke(children, 'get_proposition');
         var filters = _(domain).map(function (section) {
-            return new openerp.web.search.Filter({attrs: {
+            return new instance.web.search.Filter({attrs: {
                 string: _.str.sprintf('%s(%s)%s',
                     section[0], section[1], section[2]),
                 domain: [section]
             }}, self.view);
         });
         // Create Filter (& FilterGroup around it) with that domain
-        var f = new openerp.web.search.FilterGroup(filters, this.view);
+        var f = new instance.web.search.FilterGroup(filters, this.view);
         // add group to query
         this.view.vs.searchQuery.add({
             category: _t("Advanced"),
@@ -1349,11 +1349,11 @@ openerp.web.search.Advanced = openerp.web.search.Input.extend({
     }
 });
 
-openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{
+instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/** @lends instance.web.search.ExtendedSearchProposition# */{
     template: 'SearchView.extended_search.proposition',
     /**
-     * @constructs openerp.web.search.ExtendedSearchProposition
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.search.ExtendedSearchProposition
+     * @extends instance.web.OldWidget
      *
      * @param parent
      * @param fields
@@ -1401,10 +1401,10 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
         }
 
         var type = field.type;
-        var obj = openerp.web.search.custom_filters.get_object(type);
+        var obj = instance.web.search.custom_filters.get_object(type);
         if(obj === null) {
             console.log('Unknow field type ' + e.key);
-            obj = openerp.web.search.custom_filters.get_object("char");
+            obj = instance.web.search.custom_filters.get_object("char");
         }
         this.value = new (obj) (this);
         if(this.value.set_field) {
@@ -1430,12 +1430,12 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
     }
 });
 
-openerp.web.search.ExtendedSearchProposition.Field = openerp.web.OldWidget.extend({
+instance.web.search.ExtendedSearchProposition.Field = instance.web.OldWidget.extend({
     start: function () {
         this.$element = $("#" + this.element_id);
     }
 });
-openerp.web.search.ExtendedSearchProposition.Char = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Char = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.char',
     operators: [
         {value: "ilike", text: _lt("contains")},
@@ -1447,7 +1447,7 @@ openerp.web.search.ExtendedSearchProposition.Char = openerp.web.search.ExtendedS
         return this.$element.val();
     }
 });
-openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.DateTime = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.empty',
     operators: [
         {value: "=", text: _lt("is equal to")},
@@ -1462,11 +1462,11 @@ openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.search.Exten
     },
     start: function() {
         this._super();
-        this.datewidget = new openerp.web.DateTimeWidget(this);
+        this.datewidget = new instance.web.DateTimeWidget(this);
         this.datewidget.prependTo(this.$element);
     }
 });
-openerp.web.search.ExtendedSearchProposition.Date = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Date = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.empty',
     operators: [
         {value: "=", text: _lt("is equal to")},
@@ -1481,11 +1481,11 @@ openerp.web.search.ExtendedSearchProposition.Date = openerp.web.search.ExtendedS
     },
     start: function() {
         this._super();
-        this.datewidget = new openerp.web.DateWidget(this);
+        this.datewidget = new instance.web.DateWidget(this);
         this.datewidget.prependTo(this.$element);
     }
 });
-openerp.web.search.ExtendedSearchProposition.Integer = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Integer = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.integer',
     operators: [
         {value: "=", text: _lt("is equal to")},
@@ -1497,16 +1497,16 @@ openerp.web.search.ExtendedSearchProposition.Integer = openerp.web.search.Extend
     ],
     get_value: function() {
         try {
-            return openerp.web.parse_value(this.$element.val(), {'widget': 'integer'});
+            return instance.web.parse_value(this.$element.val(), {'widget': 'integer'});
         } catch (e) {
             return "";
         }
     }
 });
-openerp.web.search.ExtendedSearchProposition.Id = openerp.web.search.ExtendedSearchProposition.Integer.extend({
+instance.web.search.ExtendedSearchProposition.Id = instance.web.search.ExtendedSearchProposition.Integer.extend({
     operators: [{value: "=", text: _lt("is")}]
 });
-openerp.web.search.ExtendedSearchProposition.Float = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Float = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.float',
     operators: [
         {value: "=", text: _lt("is equal to")},
@@ -1518,13 +1518,13 @@ openerp.web.search.ExtendedSearchProposition.Float = openerp.web.search.Extended
     ],
     get_value: function() {
         try {
-            return openerp.web.parse_value(this.$element.val(), {'widget': 'float'});
+            return instance.web.parse_value(this.$element.val(), {'widget': 'float'});
         } catch (e) {
             return "";
         }
     }
 });
-openerp.web.search.ExtendedSearchProposition.Selection = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Selection = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.selection',
     operators: [
         {value: "=", text: _lt("is")},
@@ -1537,7 +1537,7 @@ openerp.web.search.ExtendedSearchProposition.Selection = openerp.web.search.Exte
         return this.$element.val();
     }
 });
-openerp.web.search.ExtendedSearchProposition.Boolean = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Boolean = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.boolean',
     operators: [
         {value: "=", text: _lt("is true")},
@@ -1548,21 +1548,21 @@ openerp.web.search.ExtendedSearchProposition.Boolean = openerp.web.search.Extend
     }
 });
 
-openerp.web.search.custom_filters = new openerp.web.Registry({
-    'char': 'openerp.web.search.ExtendedSearchProposition.Char',
-    'text': 'openerp.web.search.ExtendedSearchProposition.Char',
-    'one2many': 'openerp.web.search.ExtendedSearchProposition.Char',
-    'many2one': 'openerp.web.search.ExtendedSearchProposition.Char',
-    'many2many': 'openerp.web.search.ExtendedSearchProposition.Char',
+instance.web.search.custom_filters = new instance.web.Registry({
+    'char': 'instance.web.search.ExtendedSearchProposition.Char',
+    'text': 'instance.web.search.ExtendedSearchProposition.Char',
+    'one2many': 'instance.web.search.ExtendedSearchProposition.Char',
+    'many2one': 'instance.web.search.ExtendedSearchProposition.Char',
+    'many2many': 'instance.web.search.ExtendedSearchProposition.Char',
 
-    'datetime': 'openerp.web.search.ExtendedSearchProposition.DateTime',
-    'date': 'openerp.web.search.ExtendedSearchProposition.Date',
-    'integer': 'openerp.web.search.ExtendedSearchProposition.Integer',
-    'float': 'openerp.web.search.ExtendedSearchProposition.Float',
-    'boolean': 'openerp.web.search.ExtendedSearchProposition.Boolean',
-    'selection': 'openerp.web.search.ExtendedSearchProposition.Selection',
+    'datetime': 'instance.web.search.ExtendedSearchProposition.DateTime',
+    'date': 'instance.web.search.ExtendedSearchProposition.Date',
+    'integer': 'instance.web.search.ExtendedSearchProposition.Integer',
+    'float': 'instance.web.search.ExtendedSearchProposition.Float',
+    'boolean': 'instance.web.search.ExtendedSearchProposition.Boolean',
+    'selection': 'instance.web.search.ExtendedSearchProposition.Selection',
 
-    'id': 'openerp.web.search.ExtendedSearchProposition.Id'
+    'id': 'instance.web.search.ExtendedSearchProposition.Id'
 });
 
 };

From 6ca9b6ffad24e7e9065b4d7215b585c35cabe66e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:09:49 +0200
Subject: [PATCH 78/90] [imp] wip

bzr revid: nicolas.vanhoren@openerp.com-20120417120949-djxj7re89x0ae20m
---
 addons/web/static/src/js/view_editor.js |  68 ++---
 addons/web/static/src/js/view_form.js   | 350 ++++++++++++------------
 2 files changed, 209 insertions(+), 209 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 2c0dc3d70b4..59d1fed9345 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,15 +1,15 @@
-openerp.web.view_editor = function(openerp) {
-var _t = openerp.web._t;
-var QWeb = openerp.web.qweb;
-openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
+openerp.web.view_editor = function(instance) {
+var _t = instance.web._t;
+var QWeb = instance.web.qweb;
+instance.web.ViewEditor =   instance.web.OldWidget.extend({
     init: function(parent, element_id, dataset, view, options) {
         this._super(parent);
         this.element_id = element_id;
         this.parent = parent;
-        this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null),
+        this.dataset = new instance.web.DataSetSearch(this, 'ir.ui.view', null, null),
         this.model = dataset.model;
         this.xml_element_id = 0;
-        this.property = openerp.web.ViewEditor.property_widget;
+        this.property = instance.web.ViewEditor.property_widget;
         this.one_object = false;
     },
     start: function() {
@@ -39,7 +39,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
                 select_view_id: self.parent.fields_view.view_id
             }
         };
-        this.view_edit_dialog = new openerp.web.Dialog(this, {
+        this.view_edit_dialog = new instance.web.Dialog(this, {
             title: action_title,
             width: 850,
             buttons: [
@@ -51,7 +51,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         }).open();
         this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
         this.main_view_id = this.parent.fields_view.view_id;
-        this.action_manager = new openerp.web.ActionManager(this);
+        this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.view_edit_dialog);
         $.when(this.action_manager.do_action(action)).then(function() {
             var viewmanager = self.action_manager.inner_viewmanager,
@@ -67,7 +67,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     },
     on_create_view: function() {
         var self = this;
-        this.create_view_dialog = new openerp.web.Dialog(this, {
+        this.create_view_dialog = new instance.web.Dialog(this, {
             title: _.str.sprintf(_t("Create a view (%s)"), self.model),
             buttons: [
                 {text: _t("Save"), click: function () {
@@ -115,8 +115,8 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     },
     do_save_view: function(values) {
         def = $.Deferred();
-        var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null);
-        var model_dataset = new openerp.web.DataSetSearch(this, 'ir.model', null, null);
+        var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
+        var model_dataset = new instance.web.DataSetSearch(this, 'ir.model', null, null);
         var view_string = "", field_name = false, self = this;
         field_dataset.call( 'fields_get', [],  function(fields) {
             _.each(['name', 'x_name'], function(value) {
@@ -360,7 +360,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     edit_view: function(one_object) {
         var self = this;
         this.one_object = one_object;
-        this.edit_xml_dialog = new openerp.web.Dialog(this, {
+        this.edit_xml_dialog = new instance.web.Dialog(this, {
             title: _.str.sprintf(_t("View Editor %d - %s"), self.main_view_id, self.model),
             height: '90%',
             buttons: [
@@ -392,7 +392,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
                             action_buttons: false
                         }
                     };
-                    var action_manager = new openerp.web.ActionManager(self);
+                    var action_manager = new instance.web.ActionManager(self);
                     action_manager.do_action(action);
                 }},
                 {text: _t("Close"), click: function(){
@@ -517,7 +517,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         var self = this;
         var tr = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], [])[0].att_list[0];
         var parent_tr = ($(side).prevAll("tr[level=" + String(this.one_object.clicked_tr_level - 1) + "]"))[0];
-        var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null);
+        var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
         parent_tr = $(parent_tr).find('a').text();
         field_dataset.call( 'fields_get', [],  function(result) {
             var fields = _.keys(result);
@@ -811,7 +811,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     },
     on_edit_node: function(properties){
         var self = this;
-        this.edit_node_dialog = new openerp.web.Dialog(this,{
+        this.edit_node_dialog = new instance.web.Dialog(this,{
             title: _t("Properties"),
             width: 450,
             buttons: [
@@ -880,7 +880,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         this.edit_widget = [];
         self.ready  = $.when(self.on_groups(properties)).then(function () {
             _PROPERTIES_ATTRIBUTES['groups']['selection'] = self.groups;
-            var values = _.keys( openerp.web.form.widgets.map);
+            var values = _.keys( instance.web.form.widgets.map);
             values.push('');
             values.sort();
             _PROPERTIES_ATTRIBUTES['widget']['selection'] = values;
@@ -908,8 +908,8 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
             def.resolve();
         }
         var group_ids = [], group_names = {}, groups = [];
-        var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
-            model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
+        var res_groups = new instance.web.DataSetSearch(this,'res.groups', null, null),
+            model_data = new instance.web.DataSetSearch(self,'ir.model.data', null, null);
             res_groups.read_slice([], {}).done(function (res_grp) {
                 _.each(res_grp, function (res) {
                     var key = res.id;
@@ -935,7 +935,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
                             {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'},
                             {'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': 'Position','type': 'selection'}];
         this.add_widget = [];
-        this.add_node_dialog = new openerp.web.Dialog(this,{
+        this.add_node_dialog = new instance.web.Dialog(this,{
             title: _t("Properties"),
             width: 450,
             buttons: [
@@ -980,7 +980,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         });
         table_selector.find("td[id^=]").attr("width","100px");
         self.add_node_dialog.$element.find('#new_field').click(function() {
-            model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null);
+            model_data = new instance.web.DataSetSearch(self,'ir.model', null, null);
             model_data.read_slice([], {domain: [['model','=', self.model]]}).then(function(result) {
                 self.render_new_field(result[0].id);
             });
@@ -998,7 +998,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
                 action_buttons: true
             }
         };
-        var action_manager = new openerp.web.ActionManager(self);
+        var action_manager = new instance.web.ActionManager(self);
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_viewmanager.views['form'].controller;
             controller.on_button_cancel.add_last(function(){
@@ -1015,7 +1015,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         });
     }
 });
-openerp.web.ViewEditor.Field = openerp.web.Class.extend({
+instance.web.ViewEditor.Field = instance.web.Class.extend({
     init: function(view, widget) {
         this.$element = view.$element;
         this.dirty = false;
@@ -1041,7 +1041,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     validate: function() {
         this.is_invalid = false;
         try {
-            var value = openerp.web.parse_value(this.get_value(), this, '');
+            var value = instance.web.parse_value(this.get_value(), this, '');
             this.is_invalid = this.required && value === '';
         } catch(e) {
             this.is_invalid = true;
@@ -1051,7 +1051,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         return _.str.sprintf("<td id = %s>%s</td>", this.name, QWeb.render(this.template, {widget: this}))
     }
 });
-openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
+instance.web.ViewEditor.FieldBoolean = instance.web.ViewEditor.Field.extend({
     template : "vieweditor_boolean",
     start: function() {
         var self = this;
@@ -1069,7 +1069,7 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         return  this.$element.find("input[id=" + this.name + "]").is(':checked')? "1" : null;
     }
 });
-openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
+instance.web.ViewEditor.FieldChar = instance.web.ViewEditor.Field.extend({
     template : "vieweditor_char",
     start: function () {
         var self = this;
@@ -1085,7 +1085,7 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         return this.$element.find("input[id=" + this.name + "]").val();
     }
 });
-openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
+instance.web.ViewEditor.FieldSelect = instance.web.ViewEditor.Field.extend({
     template : "vieweditor_selection",
     start: function () {
         var self = this;
@@ -1115,7 +1115,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         return this.$element.find("select[id=" + this.name + "]").val();
     }
 });
-openerp.web.ViewEditor.FieldSelectMulti = openerp.web.ViewEditor.FieldSelect.extend({
+instance.web.ViewEditor.FieldSelectMulti = instance.web.ViewEditor.FieldSelect.extend({
     start: function () {
         this._super();
         this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple", true);
@@ -1131,7 +1131,7 @@ openerp.web.ViewEditor.FieldSelectMulti = openerp.web.ViewEditor.FieldSelect.ext
         });
     }
 });
-openerp.web.ViewEditor.FieldFloat = openerp.web.ViewEditor.FieldChar.extend({
+instance.web.ViewEditor.FieldFloat = instance.web.ViewEditor.FieldChar.extend({
 });
 
 var _PROPERTIES = {
@@ -1196,11 +1196,11 @@ var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
             'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
             'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph'
 ];
-openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
-    'boolean' : 'openerp.web.ViewEditor.FieldBoolean',
-    'selection_multi' : 'openerp.web.ViewEditor.FieldSelectMulti',
-    'selection' : 'openerp.web.ViewEditor.FieldSelect',
-    'char' : 'openerp.web.ViewEditor.FieldChar',
-    'float' : 'openerp.web.ViewEditor.FieldFloat'
+instance.web.ViewEditor.property_widget = new instance.web.Registry({
+    'boolean' : 'instance.web.ViewEditor.FieldBoolean',
+    'selection_multi' : 'instance.web.ViewEditor.FieldSelectMulti',
+    'selection' : 'instance.web.ViewEditor.FieldSelect',
+    'char' : 'instance.web.ViewEditor.FieldChar',
+    'float' : 'instance.web.ViewEditor.FieldFloat'
 });
 };
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index bcf3ffd2600..fdff2d95069 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1,13 +1,13 @@
-openerp.web.form = function (openerp) {
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
+openerp.web.form = function (instance) {
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
 
 /** @namespace */
-openerp.web.form = {};
+instance.web.form = {};
 
-openerp.web.views.add('form', 'openerp.web.FormView');
-openerp.web.FormView = openerp.web.View.extend({
+instance.web.views.add('form', 'instance.web.FormView');
+instance.web.FormView = instance.web.View.extend({
     /**
      * Indicates that this view is not searchable, and thus that no search
      * view should be displayed (if there is one active).
@@ -17,17 +17,17 @@ openerp.web.FormView = openerp.web.View.extend({
     display_name: _lt('Form'),
     view_type: "form",
     /**
-     * @constructs openerp.web.FormView
-     * @extends openerp.web.View
+     * @constructs instance.web.FormView
+     * @extends instance.web.View
      *
-     * @param {openerp.web.Session} session the current openerp session
-     * @param {openerp.web.DataSet} dataset the dataset this view will work with
+     * @param {instance.web.Session} session the current openerp session
+     * @param {instance.web.DataSet} dataset the dataset this view will work with
      * @param {String} view_id the identifier of the OpenERP view object
      * @param {Object} options
      *                  - sidebar : [true|false]
      *                  - resize_textareas : [true|false|max_height]
      *
-     * @property {openerp.web.Registry} registry=openerp.web.form.widgets widgets registry for this form view instance
+     * @property {instance.web.Registry} registry=instance.web.form.widgets widgets registry for this form view instance
      */
     init: function(parent, dataset, view_id, options) {
         this._super(parent);
@@ -41,8 +41,8 @@ openerp.web.FormView = openerp.web.View.extend({
         this.datarecord = {};
         this.default_focus_field = null;
         this.default_focus_button = null;
-        this.fields_registry = openerp.web.form.widgets;
-        this.tags_registry = openerp.web.form.tags;
+        this.fields_registry = instance.web.form.widgets;
+        this.tags_registry = instance.web.form.tags;
         this.has_been_loaded = $.Deferred();
         this.translatable_fields = [];
         _.defaults(this.options, {
@@ -54,7 +54,7 @@ openerp.web.FormView = openerp.web.View.extend({
         this.on_change_mutex = new $.Mutex();
         this.reload_mutex = new $.Mutex();
         this.mode = null;
-        this.rendering_engine = new openerp.web.form.FormRenderingEngineReadonly(this);
+        this.rendering_engine = new instance.web.form.FormRenderingEngineReadonly(this);
         this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
     },
     destroy: function() {
@@ -110,7 +110,7 @@ openerp.web.FormView = openerp.web.View.extend({
         });
 
         if (!this.sidebar && this.options.sidebar) {
-            this.sidebar = new openerp.web.Sidebar(this);
+            this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.$sidebar);
             this.sidebar.add_toolbar(this.fields_view.toolbar);
             this.sidebar.add_items('other', [{
@@ -131,7 +131,7 @@ openerp.web.FormView = openerp.web.View.extend({
             var child = fvg.arch.children[i];
             if (child.tag === "templates") {
                 this.qweb = new QWeb2.Engine();
-                this.qweb.add_template(openerp.web.json_node_to_xml(child));
+                this.qweb.add_template(instance.web.json_node_to_xml(child));
                 if (!this.qweb.has_template('form')) {
                     throw new Error("No QWeb template found for form view");
                 }
@@ -144,7 +144,7 @@ openerp.web.FormView = openerp.web.View.extend({
     get_fvg_from_qweb: function(record) {
         var view = this.qweb.render('form', this.get_qweb_context(record));
         var fvg = _.clone(this.fields_view);
-        fvg.arch = openerp.web.xml_to_json(openerp.web.str_to_xml(view).firstChild);
+        fvg.arch = instance.web.xml_to_json(instance.web.str_to_xml(view).firstChild);
         return fvg;
     },
     get_qweb_context: function(record) {
@@ -153,11 +153,11 @@ openerp.web.FormView = openerp.web.View.extend({
         _.each(record, function(value, name) {
             var r = _.clone(self.fields_view.fields[name] || {});
             if ((r.type === 'date' || r.type === 'datetime') && value) {
-                r.raw_value = openerp.web.auto_str_to_date(value);
+                r.raw_value = instance.web.auto_str_to_date(value);
             } else {
                 r.raw_value = value;
             }
-            r.value = openerp.web.format_value(value, r);
+            r.value = instance.web.format_value(value, r);
             new_record[name] = r;
         });
         return {
@@ -337,7 +337,7 @@ openerp.web.FormView = openerp.web.View.extend({
             'None': function () {return null;},
             'context': function (i) {
                 context_index = i;
-                var ctx = new openerp.web.CompoundContext(self.dataset.get_context(), widget.build_context() ? widget.build_context() : {});
+                var ctx = new instance.web.CompoundContext(self.dataset.get_context(), widget.build_context() ? widget.build_context() : {});
                 return ctx;
             }
         };
@@ -483,7 +483,7 @@ openerp.web.FormView = openerp.web.View.extend({
             this.on_form_changed();
         }
         if (!_.isEmpty(result.warning)) {
-        	openerp.web.dialog($(QWeb.render("CrashManagerWarning", result.warning)), {
+        	instance.web.dialog($(QWeb.render("CrashManagerWarning", result.warning)), {
                 modal: true,
                 buttons: [
                     {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
@@ -703,7 +703,7 @@ openerp.web.FormView = openerp.web.View.extend({
             if (this.sidebar) {
                 this.sidebar.do_attachement_update(this.dataset, this.datarecord.id);
             }
-            //openerp.log("The record has been created with id #" + this.datarecord.id);
+            //instance.log("The record has been created with id #" + this.datarecord.id);
             this.reload();
             return $.when(_.extend(r, {created: true})).then(success);
         }
@@ -729,7 +729,7 @@ openerp.web.FormView = openerp.web.View.extend({
     },
     get_widgets: function() {
         return _.filter(this.getChildren(), function(obj) {
-            return obj instanceof openerp.web.form.Widget;
+            return obj instanceof instance.web.form.Widget;
         });
     },
     get_fields_values: function(blacklist) {
@@ -767,7 +767,7 @@ openerp.web.FormView = openerp.web.View.extend({
             if (this.options.not_interactible_on_create)
                 return false;
         } else if (typeof(id) === "string") {
-            if(openerp.web.BufferedDataSet.virtual_id_regex.test(id))
+            if(instance.web.BufferedDataSet.virtual_id_regex.test(id))
                 return false;
         }
         return true;
@@ -819,7 +819,7 @@ openerp.web.FormView = openerp.web.View.extend({
             .filter(function (field) { return field.change_default; })
             .value();
 
-        var d = new openerp.web.Dialog(this, {
+        var d = new instance.web.Dialog(this, {
             title: _t("Set Default"),
             args: {
                 fields: fields,
@@ -836,7 +836,7 @@ openerp.web.FormView = openerp.web.View.extend({
                     }
                     var condition = d.$element.find('#formview_default_conditions').val(),
                         all_users = d.$element.find('#formview_default_all').is(':checked');
-                    new openerp.web.DataSet(self, 'ir.values').call(
+                    new instance.web.DataSet(self, 'ir.values').call(
                         'set_default', [
                             self.dataset.model,
                             field_to_set,
@@ -860,7 +860,7 @@ openerp.web.FormView = openerp.web.View.extend({
 /**
  * Interface to be implemented by rendering engines for the form view.
  */
-openerp.web.form.FormRenderingEngineInterface = {
+instance.web.form.FormRenderingEngineInterface = {
     set_fields_view: function(fields_view) {},
     set_fields_registry: function(fields_registry) {},
     render_to: function($element) {},
@@ -871,7 +871,7 @@ openerp.web.form.FormRenderingEngineInterface = {
  * 
  * It is necessary to set the view using set_view() before usage.
  */
-openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
+instance.web.form.FormRenderingEngine = instance.web.Class.extend({
     init: function(view) {
         this.view = view;
     },
@@ -890,7 +890,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
 
         // TODO: I know this will save the world and all the kitten for a moment,
         //       but one day, we will have to get rid of xml2json
-        var xml = openerp.web.json_node_to_xml(this.fvg.arch);
+        var xml = instance.web.json_node_to_xml(this.fvg.arch);
         this.$form = $('<div class="oe_form">' + xml + '</div>');
         if (this.fvg.arch.attrs && this.fvg.arch.attrs['layout'] !== 'manual') {
             this.$form.attr('layout', 'auto');
@@ -912,7 +912,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
             if (!obj) {
                 throw new Error("Widget type '"+ key + "' is not implemented");
             }
-            var w = new (obj)(self.view, openerp.web.xml_to_json($elem[0]));
+            var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
             var $label = self.labels[$elem.attr("name")];
             if ($label) {
                 w.set_input_id($label.attr("for"));
@@ -924,7 +924,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
         _.each(this.tags_to_init, function($elem) {
             var tag_name = $elem[0].tagName.toLowerCase();
             var obj = self.tags_registry.get_object(tag_name);
-            var w = new (obj)(self.view, openerp.web.xml_to_json($elem[0]));
+            var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
             w.replace($elem);
         })
         // TODO: return a deferred
@@ -1183,18 +1183,18 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
         var str_modifiers = $node.attr("modifiers") || "{}"
         var modifiers = JSON.parse(str_modifiers);
         if (modifiers.invisible !== undefined)
-            new openerp.web.form.InvisibilityChanger(this.view, this.view, modifiers.invisible, $new_element);
+            new instance.web.form.InvisibilityChanger(this.view, this.view, modifiers.invisible, $new_element);
         $new_element.addClass($node.attr("class") || "");
     },
 });
 
-openerp.web.form.FormRenderingEngineReadonly = openerp.web.form.FormRenderingEngine.extend({
+instance.web.form.FormRenderingEngineReadonly = instance.web.form.FormRenderingEngine.extend({
     alter_field: function(field) {
         field.set({"force_readonly": true});
     },
 });
 
-openerp.web.form.FormDialog = openerp.web.Dialog.extend({
+instance.web.form.FormDialog = instance.web.Dialog.extend({
     init: function(parent, options, view_id, dataset) {
         this._super(parent, options);
         this.dataset = dataset;
@@ -1203,7 +1203,7 @@ openerp.web.form.FormDialog = openerp.web.Dialog.extend({
     },
     start: function() {
         this._super();
-        this.form = new openerp.web.FormView(this, this.dataset, this.view_id, {
+        this.form = new instance.web.FormView(this, this.dataset, this.view_id, {
             sidebar: false,
             pager: false
         });
@@ -1225,7 +1225,7 @@ openerp.web.form.FormDialog = openerp.web.Dialog.extend({
     }
 });
 
-openerp.web.form.compute_domain = function(expr, fields) {
+instance.web.form.compute_domain = function(expr, fields) {
     var stack = [];
     for (var i = expr.length - 1; i >= 0; i--) {
         var ex = expr[i];
@@ -1301,13 +1301,13 @@ openerp.web.form.compute_domain = function(expr, fields) {
  *
  * Apply the result of the "invisible" domain to this.$element.
  */
-openerp.web.form.InvisibilityChangerMixin = {
+instance.web.form.InvisibilityChangerMixin = {
     init: function(field_manager, invisible_domain) {
         this._ic_field_manager = field_manager
         this._ic_invisible_modifier = invisible_domain;
         this._ic_field_manager.on("view_content_has_changed", this, function() {
             var result = this._ic_invisible_modifier === undefined ? false :
-                openerp.web.form.compute_domain(this._ic_invisible_modifier, this._ic_field_manager.fields);
+                instance.web.form.compute_domain(this._ic_invisible_modifier, this._ic_field_manager.fields);
             this.set({"invisible": result});
         });
         this.set({invisible: this._ic_invisible_modifier === true});
@@ -1325,20 +1325,20 @@ openerp.web.form.InvisibilityChangerMixin = {
     },
 };
 
-openerp.web.form.InvisibilityChanger = openerp.web.Class.extend(_.extend({}, openerp.web.GetterSetterMixin, openerp.web.form.InvisibilityChangerMixin, {
+instance.web.form.InvisibilityChanger = instance.web.Class.extend(_.extend({}, instance.web.GetterSetterMixin, instance.web.form.InvisibilityChangerMixin, {
     init: function(parent, field_manager, invisible_domain, $element) {
         this.setParent(parent);
-        openerp.web.GetterSetterMixin.init.call(this);
-        openerp.web.form.InvisibilityChangerMixin.init.call(this, field_manager, invisible_domain);
+        instance.web.GetterSetterMixin.init.call(this);
+        instance.web.form.InvisibilityChangerMixin.init.call(this, field_manager, invisible_domain);
         this.$element = $element;
         this.start();
     },
 }));
 
-openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.form.InvisibilityChangerMixin, {
+instance.web.form.Widget = instance.web.Widget.extend(_.extend({}, instance.web.form.InvisibilityChangerMixin, {
     /**
-     * @constructs openerp.web.form.Widget
-     * @extends openerp.web.Widget
+     * @constructs instance.web.form.Widget
+     * @extends instance.web.Widget
      *
      * @param view
      * @param node
@@ -1348,7 +1348,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
         this.view = view;
         this.node = node;
         this.modifiers = JSON.parse(this.node.attrs.modifiers || '{}');
-        openerp.web.form.InvisibilityChangerMixin.init.call(this, view, this.modifiers.invisible);
+        instance.web.form.InvisibilityChangerMixin.init.call(this, view, this.modifiers.invisible);
 
         this.view.on("view_content_has_changed", this, this.process_modifiers);
     },
@@ -1358,14 +1358,14 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
     },
     start: function() {
         this._super();
-        openerp.web.form.InvisibilityChangerMixin.start.call(this);
+        instance.web.form.InvisibilityChangerMixin.start.call(this);
     },
     destroy: function() {
         $.fn.tipsy.clear();
         this._super.apply(this, arguments);
     },
     process_modifiers: function() {
-        var compute_domain = openerp.web.form.compute_domain;
+        var compute_domain = instance.web.form.compute_domain;
         var to_set = {};
         for (var a in this.modifiers) {
             if (!_.include(["invisible"], a)) {
@@ -1390,7 +1390,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
                         template = 'WidgetLabel.tooltip';
                     }
                     return QWeb.render(template, {
-                        debug: openerp.connection.debug,
+                        debug: instance.connection.debug,
                         widget: widget
                 })},
                 gravity: $.fn.tipsy.autoBounds(50, 'nw'),
@@ -1417,7 +1417,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
     },
     _build_eval_context: function(blacklist) {
         var a_dataset = this.view.dataset;
-        return new openerp.web.CompoundContext(a_dataset.get_context(), this._build_view_fields_values(blacklist));
+        return new instance.web.CompoundContext(a_dataset.get_context(), this._build_view_fields_values(blacklist));
     },
     /**
      * Builds a new context usable for operations related to fields by merging
@@ -1432,7 +1432,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
         
         if (v_context.__ref || true) { //TODO: remove true
             var fields_values = this._build_eval_context(blacklist);
-            v_context = new openerp.web.CompoundContext(v_context).set_eval_context(fields_values);
+            v_context = new instance.web.CompoundContext(v_context).set_eval_context(fields_values);
         }
         return v_context;
     },
@@ -1443,13 +1443,13 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
         var final_domain = n_domain !== null ? n_domain : f_domain;
         if (!(final_domain instanceof Array) || true) { //TODO: remove true
             var fields_values = this._build_eval_context();
-            final_domain = new openerp.web.CompoundDomain(final_domain).set_eval_context(fields_values);
+            final_domain = new instance.web.CompoundDomain(final_domain).set_eval_context(fields_values);
         }
         return final_domain;
     }
 }));
 
-openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
+instance.web.form.WidgetButton = instance.web.form.Widget.extend({
     template: 'WidgetButton',
     init: function(view, node) {
         this._super(view, node);
@@ -1463,7 +1463,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
     start: function() {
         this._super.apply(this, arguments);
         this.$element.click(this.on_click);
-        if (this.node.attrs.help || openerp.connection.debug) {
+        if (this.node.attrs.help || instance.connection.debug) {
             this.do_attach_tooltip();
         }
     },
@@ -1481,7 +1481,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
         var exec_action = function() {
             if (self.node.attrs.confirm) {
                 var def = $.Deferred();
-                var dialog = openerp.web.dialog($('<div/>').text(self.node.attrs.confirm), {
+                var dialog = instance.web.dialog($('<div/>').text(self.node.attrs.confirm), {
                     title: _t('Confirm'),
                     modal: true,
                     buttons: [
@@ -1515,7 +1515,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
 
         var context = this.node.attrs.context;
         if (context && context.__ref) {
-            context = new openerp.web.CompoundContext(context);
+            context = new instance.web.CompoundContext(context);
             context.set_eval_context(this._build_eval_context());
         }
 
@@ -1546,7 +1546,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
  *     - view_content_has_changed : when the values of the fields have changed. When
  *     this event is triggered all fields should reprocess their modifiers.
  */
-openerp.web.form.FieldManagerInterface = {
+instance.web.form.FieldManagerInterface = {
 
 };
 
@@ -1561,7 +1561,7 @@ openerp.web.form.FieldManagerInterface = {
  *     - ...
  * 
  */
-openerp.web.form.FieldInterface = {
+instance.web.form.FieldInterface = {
     /**
      * Constructor takes 2 arguments:
      * - field_manager: Implements FieldManagerInterface
@@ -1618,10 +1618,10 @@ openerp.web.form.FieldInterface = {
  *      the values of the "readonly" property and the "force_readonly" property on the field manager.
  * 
  */
-openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends openerp.web.form.AbstractField# */{
+instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends instance.web.form.AbstractField# */{
     /**
-     * @constructs openerp.web.form.AbstractField
-     * @extends openerp.web.form.Widget
+     * @constructs instance.web.form.AbstractField
+     * @extends instance.web.form.Widget
      *
      * @param field_manager
      * @param node
@@ -1651,7 +1651,7 @@ openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends opene
             this.$element.addClass('oe_form_field_translatable');
             this.$element.find('.oe_field_translate').click(this.on_translate);
         }
-        if (this.node.attrs.nolabel && openerp.connection.debug) {
+        if (this.node.attrs.nolabel && instance.connection.debug) {
             this.do_attach_tooltip(this, this.$label || this.$element);
         }
         if (!this.disable_utility_classes) {
@@ -1737,7 +1737,7 @@ openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends opene
  * A mixin to apply on any field that has to completely re-render when its readonly state
  * switch.
  */
-openerp.web.form.ReinitializeFieldMixin =  {
+instance.web.form.ReinitializeFieldMixin =  {
     /**
      * Default implementation of start(), use it or call explicitly initialize_field().
      */
@@ -1770,7 +1770,7 @@ openerp.web.form.ReinitializeFieldMixin =  {
     render_value: function() {},
 };
 
-openerp.web.form.FieldChar = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldChar',
     init: function (view, node) {
         this._super(view, node);
@@ -1784,7 +1784,7 @@ openerp.web.form.FieldChar = openerp.web.form.AbstractField.extend(_.extend({},
         this.render_value();
     },
     render_value: function() {
-        var show_value = openerp.web.format_value(this.value, this, '');
+        var show_value = instance.web.format_value(this.value, this, '');
         if (!this.get("effective_readonly")) {
             this.$element.find('input').val(show_value);
         } else {
@@ -1795,14 +1795,14 @@ openerp.web.form.FieldChar = openerp.web.form.AbstractField.extend(_.extend({},
         }
     },
     set_value_from_ui: function() {
-        this.value = openerp.web.parse_value(this.$element.find('input').val(), this);
+        this.value = instance.web.parse_value(this.$element.find('input').val(), this);
         this._super();
     },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
             try {
-                var value = openerp.web.parse_value(this.$element.find('input').val(), this, '');
+                var value = instance.web.parse_value(this.$element.find('input').val(), this, '');
                 this.invalid = this.get("required") && value === '';
             } catch(e) {
                 this.invalid = true;
@@ -1814,11 +1814,11 @@ openerp.web.form.FieldChar = openerp.web.form.AbstractField.extend(_.extend({},
     }
 }));
 
-openerp.web.form.FieldID = openerp.web.form.FieldChar.extend({
+instance.web.form.FieldID = instance.web.form.FieldChar.extend({
     
 });
 
-openerp.web.form.FieldEmail = openerp.web.form.FieldChar.extend({
+instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({
     template: 'FieldEmail',
     initialize_content: function() {
         this._super();
@@ -1842,7 +1842,7 @@ openerp.web.form.FieldEmail = openerp.web.form.FieldChar.extend({
     }
 });
 
-openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
+instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
     template: 'FieldUrl',
     initialize_content: function() {
         this._super();
@@ -1872,7 +1872,7 @@ openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
     }
 });
 
-openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({
+instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
     is_field_number: true,
     init: function (view, node) {
         this._super(view, node);
@@ -1892,7 +1892,7 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({
     }
 });
 
-openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
+instance.web.DateTimeWidget = instance.web.OldWidget.extend({
     template: "web.datetimepicker",
     jqueryui_object: 'datetimepicker',
     type_of_date: "datetime",
@@ -1914,7 +1914,7 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
         });
         this.$element.find('img.oe_datepicker_trigger').click(function() {
             if (!self.get("effective_readonly") && !self.picker('widget').is(':visible')) {
-                self.picker('setDate', self.value ? openerp.web.auto_str_to_date(self.value) : new Date());
+                self.picker('setDate', self.value ? instance.web.auto_str_to_date(self.value) : new Date());
                 self.$input_picker.show();
                 self.picker('show');
                 self.$input_picker.hide();
@@ -1960,10 +1960,10 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
         }
     },
     parse_client: function(v) {
-        return openerp.web.parse_value(v, {"widget": this.type_of_date});
+        return instance.web.parse_value(v, {"widget": this.type_of_date});
     },
     format_client: function(v) {
-        return openerp.web.format_value(v, {"widget": this.type_of_date});
+        return instance.web.format_value(v, {"widget": this.type_of_date});
     },
     on_change: function() {
         if (this.is_valid()) {
@@ -1972,15 +1972,15 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web.DateWidget = openerp.web.DateTimeWidget.extend({
+instance.web.DateWidget = instance.web.DateTimeWidget.extend({
     jqueryui_object: 'datepicker',
     type_of_date: "date"
 });
 
-openerp.web.form.FieldDatetime = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: "EmptyComponent",
     build_widget: function() {
-        return new openerp.web.DateTimeWidget(this);
+        return new instance.web.DateTimeWidget(this);
     },
     destroy_content: function() {
         if (this.datewidget) {
@@ -2003,7 +2003,7 @@ openerp.web.form.FieldDatetime = openerp.web.form.AbstractField.extend(_.extend(
         if (!this.get("effective_readonly")) {
             this.datewidget.set_value(this.value);
         } else {
-            this.$element.text(openerp.web.format_value(this.value, this, ''));
+            this.$element.text(instance.web.format_value(this.value, this, ''));
         }
     },
     get_value: function() {
@@ -2024,13 +2024,13 @@ openerp.web.form.FieldDatetime = openerp.web.form.AbstractField.extend(_.extend(
     }
 }));
 
-openerp.web.form.FieldDate = openerp.web.form.FieldDatetime.extend({
+instance.web.form.FieldDate = instance.web.form.FieldDatetime.extend({
     build_widget: function() {
-        return new openerp.web.DateWidget(this);
+        return new instance.web.DateWidget(this);
     }
 });
 
-openerp.web.form.FieldText = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldText',
     initialize_content: function() {
         this.$textarea = undefined;
@@ -2044,7 +2044,7 @@ openerp.web.form.FieldText = openerp.web.form.AbstractField.extend(_.extend({},
         this.render_value();
     },
     render_value: function() {
-        var show_value = openerp.web.format_value(this.value, this, '');
+        var show_value = instance.web.format_value(this.value, this, '');
         if (!this.get("effective_readonly")) {
             this.$textarea.val(show_value);
             if (!this.resized && this.view.options.resize_textareas) {
@@ -2056,14 +2056,14 @@ openerp.web.form.FieldText = openerp.web.form.AbstractField.extend(_.extend({},
         }
     },
     set_value_from_ui: function() {
-        this.value = openerp.web.parse_value(this.$textarea.val(), this);
+        this.value = instance.web.parse_value(this.$textarea.val(), this);
         this._super();
     },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
             try {
-                var value = openerp.web.parse_value(this.$textarea.val(), this, '');
+                var value = instance.web.parse_value(this.$textarea.val(), this, '');
                 this.invalid = this.get("required") && value === '';
             } catch(e) {
                 this.invalid = true;
@@ -2098,7 +2098,7 @@ openerp.web.form.FieldText = openerp.web.form.AbstractField.extend(_.extend({},
     }
 }));
 
-openerp.web.form.FieldBoolean = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
     template: 'FieldBoolean',
     start: function() {
         this._super.apply(this, arguments);
@@ -2123,7 +2123,7 @@ openerp.web.form.FieldBoolean = openerp.web.form.AbstractField.extend({
     }
 });
 
-openerp.web.form.FieldProgressBar = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldProgressBar = instance.web.form.AbstractField.extend({
     template: 'FieldProgressBar',
     start: function() {
         this._super.apply(this, arguments);
@@ -2138,16 +2138,16 @@ openerp.web.form.FieldProgressBar = openerp.web.form.AbstractField.extend({
         if (isNaN(show_value)) {
             show_value = 0;
         }
-        var formatted_value = openerp.web.format_value(show_value, { type : 'float' }, '0');
+        var formatted_value = instance.web.format_value(show_value, { type : 'float' }, '0');
         this.$element.progressbar('option', 'value', show_value).find('span').html(formatted_value + '%');
     }
 });
 
-openerp.web.form.FieldTextXml = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldTextXml = instance.web.form.AbstractField.extend({
 // to replace view editor
 });
 
-openerp.web.form.FieldSelection = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldSelection',
     init: function(view, node) {
         var self = this;
@@ -2252,17 +2252,17 @@ openerp.web.form.FieldSelection = openerp.web.form.AbstractField.extend(_.extend
     });
 })();
 
-openerp.web.form.dialog = function(content, options) {
+instance.web.form.dialog = function(content, options) {
     options = _.extend({
         width: '90%',
         height: 'auto',
         min_width: '800px'
     }, options || {});
-    var dialog = new openerp.web.Dialog(null, options, content).open();
+    var dialog = new instance.web.Dialog(null, options, content).open();
     return dialog.$element;
 };
 
-openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: "FieldMany2One",
     init: function(view, node) {
         this._super(view, node);
@@ -2275,7 +2275,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
     },
     start: function() {
         this._super();
-        openerp.web.form.ReinitializeFieldMixin.start.call(this);
+        instance.web.form.ReinitializeFieldMixin.start.call(this);
         this.on("change:value", this, function() {
             this.floating = false;
             this.render_value();
@@ -2308,7 +2308,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
             if (!self.get('value')) {
                 return;
             }
-            var pop = new openerp.web.form.FormOpenPopup(self.view);
+            var pop = new instance.web.form.FormOpenPopup(self.view);
             pop.show_element(
                 self.field.relation,
                 self.get("value"),
@@ -2427,7 +2427,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
             this.abort_last();
             delete this.abort_last;
         }
-        var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.build_context());
+        var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
 
         dataset.name_search(search_val, self.build_domain(), 'ilike',
                 this.limit + 1, function(data) {
@@ -2477,7 +2477,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
             self._search_create_popup("form", undefined, {"default_name": name});
         };
         if (self.get_definition_options().quick_create === undefined || self.get_definition_options().quick_create) {
-            var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.build_context());
+            var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
             dataset.name_create(name, function(data) {
                 self.display_value = {};
                 self.display_value["" + data[0]] = data[1];
@@ -2492,7 +2492,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
     // all search/create popup handling
     _search_create_popup: function(view, ids, context) {
         var self = this;
-        var pop = new openerp.web.form.SelectCreatePopup(this);
+        var pop = new instance.web.form.SelectCreatePopup(this);
         pop.select_element(
             self.field.relation,
             {
@@ -2502,7 +2502,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
                 disable_multiple_selection: true
             },
             self.build_domain(),
-            new openerp.web.CompoundContext(self.build_context(), context || {})
+            new instance.web.CompoundContext(self.build_context(), context || {})
         );
         pop.on_select_elements.add(function(element_ids) {
             self.set({value: element_ids[0]});
@@ -2520,7 +2520,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
             return;
         }
         if (! no_recurse) {
-            var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.view.dataset.get_context());
+            var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.view.dataset.get_context());
             dataset.name_get([self.get("value")], function(data) {
                 self.display_value["" + self.get("value")] = data[0][1];
                 self.render_value(true);
@@ -2617,7 +2617,7 @@ var commands = {
         return [6, false, ids];
     }
 };
-openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
     multi_selection: false,
     disable_utility_classes: true,
     init: function(view, node) {
@@ -2634,7 +2634,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
 
         var self = this;
 
-        this.dataset = new openerp.web.form.One2ManyDataSet(this, this.field.relation);
+        this.dataset = new instance.web.form.One2ManyDataSet(this, this.field.relation);
         this.dataset.o2m = this;
         this.dataset.parent_view = this.view;
         this.dataset.child_name = this.name;
@@ -2695,12 +2695,12 @@ openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
         });
         this.views = views;
 
-        this.viewmanager = new openerp.web.ViewManager(this, this.dataset, views, {});
+        this.viewmanager = new instance.web.ViewManager(this, this.dataset, views, {});
         this.viewmanager.template = 'One2Many.viewmanager';
-        this.viewmanager.registry = openerp.web.views.extend({
-            list: 'openerp.web.form.One2ManyListView',
-            form: 'openerp.web.form.One2ManyFormView',
-            kanban: 'openerp.web.form.One2ManyKanbanView',
+        this.viewmanager.registry = instance.web.views.extend({
+            list: 'instance.web.form.One2ManyListView',
+            form: 'instance.web.form.One2ManyFormView',
+            kanban: 'instance.web.form.One2ManyKanbanView',
         });
         var once = $.Deferred().then(function() {
             self.init_form_last_update.resolve();
@@ -2894,21 +2894,21 @@ openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
     }
 });
 
-openerp.web.form.One2ManyDataSet = openerp.web.BufferedDataSet.extend({
+instance.web.form.One2ManyDataSet = instance.web.BufferedDataSet.extend({
     get_context: function() {
         this.context = this.o2m.build_context([this.o2m.name]);
         return this.context;
     }
 });
 
-openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
+instance.web.form.One2ManyListView = instance.web.ListView.extend({
     _template: 'One2Many.listview',
     do_add_record: function () {
         if (this.options.editable) {
             this._super.apply(this, arguments);
         } else {
             var self = this;
-            var pop = new openerp.web.form.SelectCreatePopup(this);
+            var pop = new instance.web.form.SelectCreatePopup(this);
             pop.on_default_get.add(self.dataset.on_default_get);
             pop.select_element(
                 self.o2m.field.relation,
@@ -2939,7 +2939,7 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
     },
     do_activate_record: function(index, id) {
         var self = this;
-        var pop = new openerp.web.form.FormOpenPopup(self.o2m.view);
+        var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.name,
             auto_write: false,
@@ -2965,7 +2965,7 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
     }
 });
 
-openerp.web.form.One2ManyFormView = openerp.web.FormView.extend({
+instance.web.form.One2ManyFormView = instance.web.FormView.extend({
     form_template: 'One2Many.formview',
     on_loaded: function(data) {
         this._super(data);
@@ -2984,12 +2984,12 @@ openerp.web.form.One2ManyFormView = openerp.web.FormView.extend({
 });
 
 var lazy_build_o2m_kanban_view = function() {
-if (! openerp.web_kanban || openerp.web.form.One2ManyKanbanView)
+if (! instance.web_kanban || instance.web.form.One2ManyKanbanView)
     return;
-openerp.web.form.One2ManyKanbanView = openerp.web_kanban.KanbanView.extend({
+instance.web.form.One2ManyKanbanView = instance.web_kanban.KanbanView.extend({
     open_record: function(id) {
         var self = this;
-        var pop = new openerp.web.form.FormOpenPopup(self.o2m.view);
+        var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.name,
             auto_write: false,
@@ -3015,7 +3015,7 @@ openerp.web.form.One2ManyKanbanView = openerp.web_kanban.KanbanView.extend({
 /*
  * TODO niv: clean those deferred stuff, it could be better
  */
-openerp.web.form.FieldMany2Many = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
     multi_selection: false,
     disable_utility_classes: true,
     init: function(view, node) {
@@ -3029,7 +3029,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.AbstractField.extend({
 
         var self = this;
 
-        this.dataset = new openerp.web.form.Many2ManyDataSet(this, this.field.relation);
+        this.dataset = new instance.web.form.Many2ManyDataSet(this, this.field.relation);
         this.dataset.m2m = this;
         this.dataset.on_unlink.add_last(function(ids) {
             self.on_ui_change();
@@ -3068,7 +3068,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.AbstractField.extend({
     },
     load_view: function() {
         var self = this;
-        this.list_view = new openerp.web.form.Many2ManyListView(this, this.dataset, false, {
+        this.list_view = new instance.web.form.Many2ManyListView(this, this.dataset, false, {
                     'addable': self.get("effective_readonly") ? null : _t("Add"),
                     'deletable': self.get("effective_readonly") ? false : true,
                     'selectable': self.multi_selection,
@@ -3097,7 +3097,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.AbstractField.extend({
     },
 });
 
-openerp.web.form.Many2ManyDataSet = openerp.web.DataSetStatic.extend({
+instance.web.form.Many2ManyDataSet = instance.web.DataSetStatic.extend({
     get_context: function() {
         this.context = this.m2m.build_context();
         return this.context;
@@ -3106,17 +3106,17 @@ openerp.web.form.Many2ManyDataSet = openerp.web.DataSetStatic.extend({
 
 /**
  * @class
- * @extends openerp.web.ListView
+ * @extends instance.web.ListView
  */
-openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends openerp.web.form.Many2ManyListView# */{
+instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends instance.web.form.Many2ManyListView# */{
     do_add_record: function () {
-        var pop = new openerp.web.form.SelectCreatePopup(this);
+        var pop = new instance.web.form.SelectCreatePopup(this);
         pop.select_element(
             this.model,
             {
                 title: _t("Add: ") + this.name
             },
-            new openerp.web.CompoundDomain(this.m2m_field.build_domain(), ["!", ["id", "in", this.m2m_field.dataset.ids]]),
+            new instance.web.CompoundDomain(this.m2m_field.build_domain(), ["!", ["id", "in", this.m2m_field.dataset.ids]]),
             this.m2m_field.build_context()
         );
         var self = this;
@@ -3132,7 +3132,7 @@ openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends open
     },
     do_activate_record: function(index, id) {
         var self = this;
-        var pop = new openerp.web.form.FormOpenPopup(this);
+        var pop = new instance.web.form.FormOpenPopup(this);
         pop.show_element(this.dataset.model, id, this.m2m_field.build_context(), {
             title: _t("Open: ") + this.name,
             readonly: this.getParent().get("effective_readonly")
@@ -3145,9 +3145,9 @@ openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends open
 
 /**
  * @class
- * @extends openerp.web.OldWidget
+ * @extends instance.web.OldWidget
  */
-openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends openerp.web.form.SelectCreatePopup# */{
+instance.web.form.SelectCreatePopup = instance.web.OldWidget.extend(/** @lends instance.web.form.SelectCreatePopup# */{
     template: "SelectCreatePopup",
     /**
      * options:
@@ -3173,7 +3173,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
         this.initial_ids = this.options.initial_ids;
         this.created_elements = [];
         this.renderElement();
-        openerp.web.form.dialog(this.$element, {
+        instance.web.form.dialog(this.$element, {
             close: function() {
                 self.check_exit();
             },
@@ -3184,7 +3184,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
     start: function() {
         this._super();
         var self = this;
-        this.dataset = new openerp.web.ProxyDataSet(this, this.model,
+        this.dataset = new instance.web.ProxyDataSet(this, this.model,
             this.context);
         this.dataset.create_function = function() {
             return self.options.create_function.apply(null, arguments).then(function(r) {
@@ -3225,7 +3225,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
         if (this.searchview) {
             this.searchview.destroy();
         }
-        this.searchview = new openerp.web.SearchView(this,
+        this.searchview = new instance.web.SearchView(this,
                 this.dataset, false,  search_defaults);
         this.searchview.on_search.add(function(domains, contexts, groupbys) {
             if (self.initial_ids) {
@@ -3237,7 +3237,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             }
         });
         this.searchview.on_loaded.add_last(function () {
-            self.view_list = new openerp.web.form.SelectCreateListView(self,
+            self.view_list = new instance.web.form.SelectCreateListView(self,
                     self.dataset, false,
                     _.extend({'deletable': false,
                         'selectable': !self.options.disable_multiple_selection
@@ -3279,14 +3279,14 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
     },
     create_row: function() {
         var self = this;
-        var wdataset = new openerp.web.DataSetSearch(this, this.model, this.context, this.domain);
+        var wdataset = new instance.web.DataSetSearch(this, this.model, this.context, this.domain);
         wdataset.parent_view = this.options.parent_view;
         wdataset.child_name = this.options.child_name;
         return wdataset.create.apply(wdataset, arguments);
     },
     write_row: function() {
         var self = this;
-        var wdataset = new openerp.web.DataSetSearch(this, this.model, this.context, this.domain);
+        var wdataset = new instance.web.DataSetSearch(this, this.model, this.context, this.domain);
         wdataset.parent_view = this.options.parent_view;
         wdataset.child_name = this.options.child_name;
         return wdataset.write.apply(wdataset, arguments);
@@ -3310,7 +3310,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             this.view_list.$element.hide();
         }
         this.dataset.index = null;
-        this.view_form = new openerp.web.FormView(this, this.dataset, false, self.options.form_view_options);
+        this.view_form = new instance.web.FormView(this, this.dataset, false, self.options.form_view_options);
         if (this.options.alternative_form_view) {
             this.view_form.set_embedded_view(this.options.alternative_form_view);
         }
@@ -3350,7 +3350,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
     on_default_get: function(res) {}
 });
 
-openerp.web.form.SelectCreateListView = openerp.web.ListView.extend({
+instance.web.form.SelectCreateListView = instance.web.ListView.extend({
     do_add_record: function () {
         this.popup.new_object();
     },
@@ -3366,9 +3366,9 @@ openerp.web.form.SelectCreateListView = openerp.web.ListView.extend({
 
 /**
  * @class
- * @extends openerp.web.OldWidget
+ * @extends instance.web.OldWidget
  */
-openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp.web.form.FormOpenPopup# */{
+instance.web.form.FormOpenPopup = instance.web.OldWidget.extend(/** @lends instance.web.form.FormOpenPopup# */{
     template: "FormOpenPopup",
     /**
      * options:
@@ -3386,7 +3386,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
         this.context = context || {};
         this.options = _.defaults(options || {}, {"auto_write": true});
         this.renderElement();
-        openerp.web.dialog(this.$element, {
+        instance.web.dialog(this.$element, {
             title: options.title || '',
             modal: true,
             width: 960,
@@ -3396,7 +3396,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
     },
     start: function() {
         this._super();
-        this.dataset = new openerp.web.form.FormOpenDataset(this, this.model, this.context);
+        this.dataset = new instance.web.form.FormOpenDataset(this, this.model, this.context);
         this.dataset.fop = this;
         this.dataset.ids = [this.row_id];
         this.dataset.index = 0;
@@ -3408,7 +3408,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
         if (!this.options.auto_write)
             return;
         var self = this;
-        var wdataset = new openerp.web.DataSetSearch(this, this.model, this.context, this.domain);
+        var wdataset = new instance.web.DataSetSearch(this, this.model, this.context, this.domain);
         wdataset.parent_view = this.options.parent_view;
         wdataset.child_name = this.options.child_name;
         wdataset.write(id, data, {}, function(r) {
@@ -3418,7 +3418,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
     on_write_completed: function() {},
     setup_form_view: function() {
         var self = this;
-        var FormClass = openerp.web.views.get_object('form');
+        var FormClass = instance.web.views.get_object('form');
         var options = _.clone(self.options.form_view_options);
         options.initial_mode = this.options.readonly ? "view" : "edit";
         this.view_form = new FormClass(this, this.dataset, false, options);
@@ -3449,7 +3449,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
     }
 });
 
-openerp.web.form.FormOpenDataset = openerp.web.ProxyDataSet.extend({
+instance.web.form.FormOpenDataset = instance.web.ProxyDataSet.extend({
     read_ids: function() {
         if (this.fop.options.read_function) {
             return this.fop.options.read_function.apply(null, arguments);
@@ -3459,7 +3459,7 @@ openerp.web.form.FormOpenDataset = openerp.web.ProxyDataSet.extend({
     }
 });
 
-openerp.web.form.FieldReference = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldReference',
     init: function(view, node) {
         this._super(view, node);
@@ -3503,7 +3503,7 @@ openerp.web.form.FieldReference = openerp.web.form.AbstractField.extend(_.extend
         }
     },
     initialize_content: function() {
-        this.selection = new openerp.web.form.FieldSelection(this, { attrs: {
+        this.selection = new instance.web.form.FieldSelection(this, { attrs: {
             name: 'selection',
             widget: 'selection'
         }});
@@ -3513,7 +3513,7 @@ openerp.web.form.FieldReference = openerp.web.form.AbstractField.extend(_.extend
         this.selection.renderElement();
         this.selection.start();
 
-        this.m2o = new openerp.web.form.FieldMany2One(this, { attrs: {
+        this.m2o = new instance.web.form.FieldMany2One(this, { attrs: {
             name: 'm2o',
             widget: 'many2one'
         }});
@@ -3560,7 +3560,7 @@ openerp.web.form.FieldReference = openerp.web.form.AbstractField.extend(_.extend
     }
 }));
 
-openerp.web.form.FieldBinary = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     init: function(view, node) {
         this._super(view, node);
         this.iframe = this.element_id + '_iframe';
@@ -3619,7 +3619,7 @@ openerp.web.form.FieldBinary = openerp.web.form.AbstractField.extend(_.extend({}
                 context: this.view.dataset.get_context()
             })},
             complete: $.unblockUI,
-            error: openerp.webclient.crashmanager.on_rpc_error
+            error: instance.webclient.crashmanager.on_rpc_error
         });
     },
     on_clear: function() {
@@ -3632,7 +3632,7 @@ openerp.web.form.FieldBinary = openerp.web.form.AbstractField.extend(_.extend({}
     }
 }));
 
-openerp.web.form.FieldBinaryFile = openerp.web.form.FieldBinary.extend({
+instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
     template: 'FieldBinaryFile',
     initialize_content: function() {
         this._super();
@@ -3688,7 +3688,7 @@ openerp.web.form.FieldBinaryFile = openerp.web.form.FieldBinary.extend({
     }
 });
 
-openerp.web.form.FieldBinaryImage = openerp.web.form.FieldBinary.extend({
+instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
     template: 'FieldBinaryImage',
     initialize_content: function() {
         this._super();
@@ -3730,7 +3730,7 @@ openerp.web.form.FieldBinaryImage = openerp.web.form.FieldBinary.extend({
     }
 });
 
-openerp.web.form.FieldStatus = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
     template: "EmptyComponent",
     start: function() {
         this._super();
@@ -3758,7 +3758,7 @@ openerp.web.form.FieldStatus = openerp.web.form.AbstractField.extend({
             });
         }
 
-        var content = openerp.web.qweb.render("FieldStatus.content", {widget: this, _:_});
+        var content = instance.web.qweb.render("FieldStatus.content", {widget: this, _:_});
         this.$element.html(content);
 
         var colors = JSON.parse((this.node.attrs || {}).statusbar_colors || "{}");
@@ -3796,34 +3796,34 @@ openerp.web.form.FieldStatus = openerp.web.form.AbstractField.extend({
 });
 
 /**
- * Registry of form widgets, called by :js:`openerp.web.FormView`
+ * Registry of form widgets, called by :js:`instance.web.FormView`
  */
-openerp.web.form.widgets = new openerp.web.Registry({
-    'char' : 'openerp.web.form.FieldChar',
-    'id' : 'openerp.web.form.FieldID',
-    'email' : 'openerp.web.form.FieldEmail',
-    'url' : 'openerp.web.form.FieldUrl',
-    'text' : 'openerp.web.form.FieldText',
-    'date' : 'openerp.web.form.FieldDate',
-    'datetime' : 'openerp.web.form.FieldDatetime',
-    'selection' : 'openerp.web.form.FieldSelection',
-    'many2one' : 'openerp.web.form.FieldMany2One',
-    'many2many' : 'openerp.web.form.FieldMany2Many',
-    'one2many' : 'openerp.web.form.FieldOne2Many',
-    'one2many_list' : 'openerp.web.form.FieldOne2Many',
-    'reference' : 'openerp.web.form.FieldReference',
-    'boolean' : 'openerp.web.form.FieldBoolean',
-    'float' : 'openerp.web.form.FieldFloat',
-    'integer': 'openerp.web.form.FieldFloat',
-    'float_time': 'openerp.web.form.FieldFloat',
-    'progressbar': 'openerp.web.form.FieldProgressBar',
-    'image': 'openerp.web.form.FieldBinaryImage',
-    'binary': 'openerp.web.form.FieldBinaryFile',
-    'statusbar': 'openerp.web.form.FieldStatus'
+instance.web.form.widgets = new instance.web.Registry({
+    'char' : 'instance.web.form.FieldChar',
+    'id' : 'instance.web.form.FieldID',
+    'email' : 'instance.web.form.FieldEmail',
+    'url' : 'instance.web.form.FieldUrl',
+    'text' : 'instance.web.form.FieldText',
+    'date' : 'instance.web.form.FieldDate',
+    'datetime' : 'instance.web.form.FieldDatetime',
+    'selection' : 'instance.web.form.FieldSelection',
+    'many2one' : 'instance.web.form.FieldMany2One',
+    'many2many' : 'instance.web.form.FieldMany2Many',
+    'one2many' : 'instance.web.form.FieldOne2Many',
+    'one2many_list' : 'instance.web.form.FieldOne2Many',
+    'reference' : 'instance.web.form.FieldReference',
+    'boolean' : 'instance.web.form.FieldBoolean',
+    'float' : 'instance.web.form.FieldFloat',
+    'integer': 'instance.web.form.FieldFloat',
+    'float_time': 'instance.web.form.FieldFloat',
+    'progressbar': 'instance.web.form.FieldProgressBar',
+    'image': 'instance.web.form.FieldBinaryImage',
+    'binary': 'instance.web.form.FieldBinaryFile',
+    'statusbar': 'instance.web.form.FieldStatus'
 });
 
-openerp.web.form.tags = new openerp.web.Registry({
-    'button' : 'openerp.web.form.WidgetButton',
+instance.web.form.tags = new instance.web.Registry({
+    'button' : 'instance.web.form.WidgetButton',
 });
 
 };

From 759be357ce22c2ebde17a509cb80b9af01089f81 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:15:59 +0200
Subject: [PATCH 79/90] [imp] remaining of refactoring

bzr revid: nicolas.vanhoren@openerp.com-20120417121559-e94wr8ym8sb2f7c1
---
 addons/web/static/src/js/view_list.js         |  94 ++++++++--------
 .../web/static/src/js/view_list_editable.js   |  30 ++---
 addons/web/static/src/js/view_tree.js         |  20 ++--
 addons/web/static/src/js/views.js             | 104 +++++++++---------
 4 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index d8ef6ecb34f..d149ef28840 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1,9 +1,9 @@
-openerp.web.list = function (openerp) {
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
-openerp.web.views.add('list', 'openerp.web.ListView');
-openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# */ {
+openerp.web.list = function (instance) {
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
+instance.web.views.add('list', 'instance.web.ListView');
+instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListView# */ {
     _template: 'ListView',
     display_name: _lt('List'),
     defaults: {
@@ -33,11 +33,11 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * See constructor parameters and method documentations for information on
      * the default behaviors and possible options for the list view.
      *
-     * @constructs openerp.web.ListView
-     * @extends openerp.web.View
+     * @constructs instance.web.ListView
+     * @extends instance.web.View
      *
      * @param parent parent object
-     * @param {openerp.web.DataSet} dataset the dataset the view should work with
+     * @param {instance.web.DataSet} dataset the dataset the view should work with
      * @param {String} view_id the listview's identifier, if any
      * @param {Object} options A set of options used to configure the view
      * @param {Boolean} [options.selectable=true] determines whether view rows are selectable (e.g. via a checkbox)
@@ -61,12 +61,12 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
 
         this.records = new Collection();
 
-        this.set_groups(new openerp.web.ListView.Groups(this));
+        this.set_groups(new instance.web.ListView.Groups(this));
 
-        if (this.dataset instanceof openerp.web.DataSetStatic) {
-            this.groups.datagroup = new openerp.web.StaticDataGroup(this.dataset);
+        if (this.dataset instanceof instance.web.DataSetStatic) {
+            this.groups.datagroup = new instance.web.StaticDataGroup(this.dataset);
         } else {
-            this.groups.datagroup = new openerp.web.DataGroup(
+            this.groups.datagroup = new instance.web.DataGroup(
                 this, this.model,
                 dataset.get_domain(),
                 dataset.get_context(),
@@ -104,7 +104,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     /**
      * Set a custom Group construct as the root of the List View.
      *
-     * @param {openerp.web.ListView.Groups} groups
+     * @param {instance.web.ListView.Groups} groups
      */
     set_groups: function (groups) {
         var self = this;
@@ -302,7 +302,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
 
         // Sidebar
         if (!this.sidebar && this.options.sidebar && this.options.$sidebar) {
-            this.sidebar = new openerp.web.Sidebar(this);
+            this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.options.$sidebar);
             this.sidebar.add_toolbar(this.fields_view.toolbar);
         }
@@ -312,7 +312,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      *
      * Horrifying side-effect: sets the dataset's data on this.dataset?
      *
-     * @param {openerp.web.DataSet} dataset
+     * @param {instance.web.DataSet} dataset
      */
     configure_pager: function (dataset) {
         this.dataset.ids = dataset.ids;
@@ -336,7 +336,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * @param {Boolean} [grouped] Should the grouping columns (group and count) be displayed
      */
     setup_columns: function (fields, grouped) {
-        var domain_computer = openerp.web.form.compute_domain;
+        var domain_computer = instance.web.form.compute_domain;
 
         var noop = function () { return {}; };
         var field_to_column = function (field) {
@@ -405,7 +405,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      *
      * The default implementation asks the list view's view manager to switch
      * to a different view (by calling
-     * :js:func:`~openerp.web.ViewManager.on_mode_switch`), using the
+     * :js:func:`~instance.web.ViewManager.on_mode_switch`), using the
      * provided record index (within the current list view's dataset).
      *
      * If the index is null, ``switch_to_record`` asks for the creation of a
@@ -526,7 +526,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      */
     do_search: function (domain, context, group_by) {
         this.page = 0;
-        this.groups.datagroup = new openerp.web.DataGroup(
+        this.groups.datagroup = new instance.web.DataGroup(
             this, this.model, domain, context, group_by);
         this.groups.datagroup.sort = this.dataset._sort;
 
@@ -598,7 +598,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             return;
         }
 
-        var c = new openerp.web.CompoundContext();
+        var c = new instance.web.CompoundContext();
         c.set_eval_context(_.extend({
             active_id: id,
             active_ids: [id],
@@ -615,7 +615,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      *
      * @param {Number} index index of the record in the dataset
      * @param {Object} id identifier of the activated record
-     * @param {openerp.web.DataSet} dataset dataset in which the record is available (may not be the listview's dataset in case of nested groups)
+     * @param {instance.web.DataSet} dataset dataset in which the record is available (may not be the listview's dataset in case of nested groups)
      */
     do_activate_record: function (index, id, dataset, view) {
         this.dataset.ids = dataset.ids;
@@ -639,11 +639,11 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     /**
      * Computes the aggregates for the current list view, either on the
      * records provided or on the records of the internal
-     * :js:class:`~openerp.web.ListView.Group`, by calling
-     * :js:func:`~openerp.web.ListView.group.get_records`.
+     * :js:class:`~instance.web.ListView.Group`, by calling
+     * :js:func:`~instance.web.ListView.group.get_records`.
      *
      * Then displays the aggregates in the table through
-     * :js:method:`~openerp.web.ListView.display_aggregates`.
+     * :js:method:`~instance.web.ListView.display_aggregates`.
      *
      * @param {Array} [records]
      */
@@ -719,7 +719,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             }
 
             $footer_cells.filter(_.str.sprintf('[data-field=%s]', column.id))
-                .html(openerp.web.format_cell(aggregation, column, {
+                .html(instance.web.format_cell(aggregation, column, {
                     process_modifiers: false
             }));
         });
@@ -772,7 +772,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         }
     }
 });
-openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.ListView.List# */{
+instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.ListView.List# */{
     /**
      * List display for the ListView, handles basic DOM events and transforms
      * them in the relevant higher-level events, to which the list view (or
@@ -797,10 +797,10 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
      *   Triggered when a row of the table is clicked, provides the index (in
      *   the rows array) and id of the selected record to the handle function.
      *
-     * @constructs openerp.web.ListView.List
-     * @extends openerp.web.Class
+     * @constructs instance.web.ListView.List
+     * @extends instance.web.Class
      * 
-     * @param {Object} opts display options, identical to those of :js:class:`openerp.web.ListView`
+     * @param {Object} opts display options, identical to those of :js:class:`instance.web.ListView`
      */
     init: function (group, opts) {
         var self = this;
@@ -915,7 +915,7 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
                 // to get a correctly displayable value in the field
                 var model = ref_match[1],
                     id = parseInt(ref_match[2], 10);
-                new openerp.web.DataSet(this.view, model).name_get([id], function(names) {
+                new instance.web.DataSet(this.view, model).name_get([id], function(names) {
                     if (!names.length) { return; }
                     record.set(column.id, names[0][1]);
                 });
@@ -930,14 +930,14 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
                 // fetch the name, set it on the record (in the right field)
                 // and let the various registered events handle refreshing the
                 // row
-                new openerp.web.DataSet(this.view, column.relation)
+                new instance.web.DataSet(this.view, column.relation)
                         .name_get([value], function (names) {
                     if (!names.length) { return; }
                     record.set(column.id, names[0]);
                 });
             }
         }
-        return openerp.web.format_cell(record.toForm().data, column, {
+        return instance.web.format_cell(record.toForm().data, column, {
             model: this.dataset.model,
             id: record.get('id')
         });
@@ -1091,19 +1091,19 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
         });
     }
 });
-openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.ListView.Groups# */{
+instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.web.ListView.Groups# */{
     passtrough_events: 'action deleted row_link',
     /**
      * Grouped display for the ListView. Handles basic DOM events and interacts
-     * with the :js:class:`~openerp.web.DataGroup` bound to it.
+     * with the :js:class:`~instance.web.DataGroup` bound to it.
      *
      * Provides events similar to those of
-     * :js:class:`~openerp.web.ListView.List`
+     * :js:class:`~instance.web.ListView.List`
      *
-     * @constructs openerp.web.ListView.Groups
-     * @extends openerp.web.Class
+     * @constructs instance.web.ListView.Groups
+     * @extends instance.web.Class
      *
-     * @param {openerp.web.ListView} view
+     * @param {instance.web.ListView} view
      * @param {Object} [options]
      * @param {Collection} [options.records]
      * @param {Object} [options.options]
@@ -1214,7 +1214,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                 self.records.proxy(group.value).reset();
                 delete self.children[group.value];
             }
-            var child = self.children[group.value] = new openerp.web.ListView.Groups(self.view, {
+            var child = self.children[group.value] = new instance.web.ListView.Groups(self.view, {
                 records: self.records.proxy(group.value),
                 options: self.options,
                 columns: self.columns
@@ -1250,7 +1250,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                 var group_column = _(self.columns).detect(function (column) {
                     return column.id === group.grouped_on; });
                 try {
-                    $group_column.html(openerp.web.format_cell(
+                    $group_column.html(instance.web.format_cell(
                         row_data, group_column, {
                             value_if_empty: _t("Undefined"),
                             process_modifiers: false
@@ -1287,7 +1287,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                         var r = {};
                         r[column.id] = {value: group.aggregates[column.id]};
                         $('<td class="oe-number">')
-                            .html(openerp.web.format_cell(
+                            .html(instance.web.format_cell(
                                 r, column, {process_modifiers: false}))
                             .appendTo($row);
                     } else {
@@ -1320,7 +1320,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
     },
     render_dataset: function (dataset) {
         var self = this,
-            list = new openerp.web.ListView.List(this, {
+            list = new instance.web.ListView.List(this, {
                 options: this.options,
                 columns: this.columns,
                 dataset: dataset,
@@ -1533,10 +1533,10 @@ var Events = /** @lends Events# */{
         return this;
     }
 };
-var Record = openerp.web.Class.extend(/** @lends Record# */{
+var Record = instance.web.Class.extend(/** @lends Record# */{
     /**
      * @constructs Record
-     * @extends openerp.web.Class
+     * @extends instance.web.Class
      * 
      * @mixes Events
      * @param {Object} [data]
@@ -1614,7 +1614,7 @@ var Record = openerp.web.Class.extend(/** @lends Record# */{
     }
 });
 Record.include(Events);
-var Collection = openerp.web.Class.extend(/** @lends Collection# */{
+var Collection = instance.web.Class.extend(/** @lends Collection# */{
     /**
      * Smarter collections, with events, very strongly inspired by Backbone's.
      *
@@ -1622,7 +1622,7 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
      * various serious 
      *
      * @constructs Collection
-     * @extends openerp.web.Class
+     * @extends instance.web.Class
      * 
      * @mixes Events
      * @param {Array} [records] records to initialize the collection with
@@ -1797,7 +1797,7 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
     }
 });
 Collection.include(Events);
-openerp.web.list = {
+instance.web.list = {
     Events: Events,
     Record: Record,
     Collection: Collection
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 41f8c012731..ac19e3f341d 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -2,16 +2,16 @@
  * handles editability case for lists, because it depends on form and forms already depends on lists it had to be split out
  * @namespace
  */
-openerp.web.list_editable = function (openerp) {
+openerp.web.list_editable = function (instance) {
     var KEY_RETURN = 13,
         KEY_ESCAPE = 27;
-    var QWeb = openerp.web.qweb;
+    var QWeb = instance.web.qweb;
 
     // editability status of list rows
-    openerp.web.ListView.prototype.defaults.editable = null;
+    instance.web.ListView.prototype.defaults.editable = null;
 
     // TODO: not sure second @lends on existing item is correct, to check
-    openerp.web.ListView.include(/** @lends openerp.web.ListView# */{
+    instance.web.ListView.include(/** @lends instance.web.ListView# */{
         init: function () {
             var self = this;
             this._super.apply(this, arguments);
@@ -37,7 +37,7 @@ openerp.web.list_editable = function (openerp) {
          *
          * @param {Number} index index of the record in the dataset
          * @param {Object} id identifier of the record being edited
-         * @param {openerp.web.DataSet} dataset dataset in which the record is available
+         * @param {instance.web.DataSet} dataset dataset in which the record is available
          */
         do_edit: function (index, id, dataset) {
             _.extend(this.dataset, dataset);
@@ -93,8 +93,8 @@ openerp.web.list_editable = function (openerp) {
         }
     });
 
-    openerp.web.ListView.Groups.include(/** @lends openerp.web.ListView.Groups# */{
-        passtrough_events: openerp.web.ListView.Groups.prototype.passtrough_events + " edit saved",
+    instance.web.ListView.Groups.include(/** @lends instance.web.ListView.Groups# */{
+        passtrough_events: instance.web.ListView.Groups.prototype.passtrough_events + " edit saved",
         new_record: function () {
             // TODO: handle multiple children
             this.children[null].new_record();
@@ -113,7 +113,7 @@ openerp.web.list_editable = function (openerp) {
         }
     });
 
-    openerp.web.ListView.List.include(/** @lends openerp.web.ListView.List# */{
+    instance.web.ListView.List.include(/** @lends instance.web.ListView.List# */{
         row_clicked: function (event) {
             if (!this.options.editable) {
                 return this._super.apply(this, arguments);
@@ -236,7 +236,7 @@ openerp.web.list_editable = function (openerp) {
                 self.edition = true;
                 self.edition_id = record_id;
                 $new_row.addClass("oe_form_container");
-                self.edition_form = new openerp.web.ListEditableFormView(self.view, self.dataset, false);
+                self.edition_form = new instance.web.ListEditableFormView(self.view, self.dataset, false);
                 self.edition_form.$element = $new_row;
                 self.edition_form.editable_list = self;
                 // HO HO
@@ -274,7 +274,7 @@ openerp.web.list_editable = function (openerp) {
                         // insert after the source record
                         var index = self.records.indexOf(
                             self.records.get(source_record_id)) + 1;
-                        record = new openerp.web.list.Record({id: id});
+                        record = new instance.web.list.Record({id: id});
                         self.records.add(record, {at: index});
                         self.dataset.ids.splice(index, 0, id);
                     }
@@ -368,15 +368,15 @@ openerp.web.list_editable = function (openerp) {
         }
     });
     
-    openerp.web.ListEditableFormView = openerp.web.FormView.extend({
+    instance.web.ListEditableFormView = instance.web.FormView.extend({
         init: function() {
             this._super.apply(this, arguments);
-            this.rendering_engine = new openerp.web.ListEditableRenderingEngine(this);
+            this.rendering_engine = new instance.web.ListEditableRenderingEngine(this);
         },
         renderElement: function() {}
     });
     
-    openerp.web.ListEditableRenderingEngine = openerp.web.Class.extend({
+    instance.web.ListEditableRenderingEngine = instance.web.Class.extend({
         init: function(view) {
             this.view = view;
         },
@@ -392,7 +392,7 @@ openerp.web.list_editable = function (openerp) {
         render_to: function($element) {
             var self = this;
     
-            var xml = openerp.web.json_node_to_xml(this.fvg.arch);
+            var xml = instance.web.json_node_to_xml(this.fvg.arch);
             var $xml = $(xml);
             
             if (this.view.editable_list.options.selectable)
@@ -412,7 +412,7 @@ openerp.web.list_editable = function (openerp) {
                     key = $(el).attr('widget') || self.fvg.fields[name].type;
                 }
                 var obj = self.view.fields_registry.get_object(key);
-                var w = new (obj)(self.view, openerp.web.xml_to_json(el));
+                var w = new (obj)(self.view, instance.web.xml_to_json(el));
                 self.view.register_field(w, $(el).attr("name"));
                 w.appendTo($td);
                 $td.appendTo($element);
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index 72a643b3d51..9e938fe293a 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -2,12 +2,12 @@
  * OpenERP web library
  *---------------------------------------------------------*/
 
-openerp.web.view_tree = function(openerp) {
-var QWeb = openerp.web.qweb,
-      _lt = openerp.web._lt;
+openerp.web.view_tree = function(instance) {
+var QWeb = instance.web.qweb,
+      _lt = instance.web._lt;
 
-openerp.web.views.add('tree', 'openerp.web.TreeView');
-openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView# */{
+instance.web.views.add('tree', 'instance.web.TreeView');
+instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeView# */{
     display_name: _lt('Tree'),
     /**
      * Indicates that this view is not searchable, and thus that no search
@@ -17,8 +17,8 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
     /**
      * Genuine tree view (the one displayed as a tree, not the list)
      *
-     * @constructs openerp.web.TreeView
-     * @extends openerp.web.View
+     * @constructs instance.web.TreeView
+     * @extends instance.web.View
      *
      * @param parent
      * @param dataset
@@ -203,7 +203,7 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
                 'fields_view': self.fields_view.arch.children,
                 'fields': self.fields,
                 'level': $curr_node.data('level') || 0,
-                'render': openerp.web.format_value,
+                'render': instance.web.format_value,
                 'color_for': self.color_for
             });
 
@@ -226,12 +226,12 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
         return this.rpc('/web/treeview/action', {
             id: id,
             model: this.dataset.model,
-            context: new openerp.web.CompoundContext(
+            context: new instance.web.CompoundContext(
                 this.dataset.get_context(), local_context)
         }).pipe(function (actions) {
             if (!actions.length) { return; }
             var action = actions[0][2];
-            var c = new openerp.web.CompoundContext(local_context);
+            var c = new instance.web.CompoundContext(local_context);
             if (action.context) {
                 c.add(action.context);
             }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 79d3d4cd167..3e4d2056c93 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -2,11 +2,11 @@
  * OpenERP web library
  *---------------------------------------------------------*/
 
-openerp.web.views = function(session) {
-var QWeb = session.web.qweb,
-    _t = session.web._t;
+openerp.web.views = function(instance) {
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 
-session.web.ActionManager = session.web.Widget.extend({
+instance.web.ActionManager = instance.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
         this.inner_action = null;
@@ -52,8 +52,8 @@ session.web.ActionManager = session.web.Widget.extend({
             if (run_action) {
                 this.null_action();
                 action_loaded = this.do_action(state.action_id);
-                session.webclient.menu.has_been_loaded.then(function() {
-                    session.webclient.menu.open_action(state.action_id);
+                instance.webclient.menu.has_been_loaded.then(function() {
+                    instance.webclient.menu.open_action(state.action_id);
                 });
             }
         } else if (state.model && state.id) {
@@ -124,31 +124,31 @@ session.web.ActionManager = session.web.Widget.extend({
                 .contains(action.res_model)) {
             var old_close = on_close;
             on_close = function () {
-                session.webclient.do_reload().then(old_close);
+                instance.webclient.do_reload().then(old_close);
             };
         }
         if (action.target === 'new') {
             if (this.dialog == null) {
-                this.dialog = new session.web.Dialog(this, { width: '80%' });
+                this.dialog = new instance.web.Dialog(this, { width: '80%' });
                 if(on_close)
                     this.dialog.on_close.add(on_close);
             } else {
                 this.dialog_viewmanager.destroy();
             }
             this.dialog.dialog_title = action.name;
-            this.dialog_viewmanager = new session.web.ViewManagerAction(this, action);
+            this.dialog_viewmanager = new instance.web.ViewManagerAction(this, action);
             this.dialog_viewmanager.appendTo(this.dialog.$element);
             this.dialog.open();
         } else  {
             if(action.menu_id) {
                 return this.getParent().do_action(action, function () {
-                    session.webclient.menu.open_menu(action.menu_id);
+                    instance.webclient.menu.open_menu(action.menu_id);
                 });
             }
             this.dialog_stop();
             this.content_stop();
             this.inner_action = action;
-            this.inner_viewmanager = new session.web.ViewManagerAction(this, action);
+            this.inner_viewmanager = new instance.web.ViewManagerAction(this, action);
             this.inner_viewmanager.appendTo(this.$element);
         }
     },
@@ -170,7 +170,7 @@ session.web.ActionManager = session.web.Widget.extend({
     ir_actions_client: function (action) {
         this.content_stop();
         this.dialog_stop();
-        var ClientWidget = session.web.client_actions.get_object(action.tag);
+        var ClientWidget = instance.web.client_actions.get_object(action.tag);
         (this.client_widget = new ClientWidget(this, action.params)).appendTo(this.$element);
     },
     ir_actions_report_xml: function(action, on_closed) {
@@ -192,7 +192,7 @@ session.web.ActionManager = session.web.Widget.extend({
                     }
                     self.dialog_stop();
                 },
-                error: session.webclient.crashmanager.on_rpc_error
+                error: instance.webclient.crashmanager.on_rpc_error
             })
         });
     },
@@ -204,7 +204,7 @@ session.web.ActionManager = session.web.Widget.extend({
     }
 });
 
-session.web.ViewManager =  session.web.Widget.extend({
+instance.web.ViewManager =  instance.web.Widget.extend({
     template: "ViewManager",
     init: function(parent, dataset, views, flags) {
         this._super(parent);
@@ -214,7 +214,7 @@ session.web.ViewManager =  session.web.Widget.extend({
         this.active_view = null;
         this.views_src = _.map(views, function(x) {
             if (x instanceof Array) {
-                var View = session.web.views.get_object(x[1], true);
+                var View = instance.web.views.get_object(x[1], true);
                 return {
                     view_id: x[0],
                     view_type: x[1],
@@ -226,7 +226,7 @@ session.web.ViewManager =  session.web.Widget.extend({
         });
         this.views = {};
         this.flags = flags || {};
-        this.registry = session.web.views;
+        this.registry = instance.web.views;
         this.views_history = [];
     },
     /**
@@ -376,7 +376,7 @@ session.web.ViewManager =  session.web.Widget.extend({
         if (this.searchview) {
             this.searchview.destroy();
         }
-        this.searchview = new session.web.SearchView(this, this.dataset, view_id, search_defaults, this.flags.search_view === false);
+        this.searchview = new instance.web.SearchView(this, this.dataset, view_id, search_defaults, this.flags.search_view === false);
 
         this.searchview.on_search.add(this.do_searchview_search);
         return this.searchview.appendTo(this.$element.find(".oe_view_manager_view_search"));
@@ -435,13 +435,13 @@ session.web.ViewManager =  session.web.Widget.extend({
     }
 });
 
-session.web.ViewManagerAction = session.web.ViewManager.extend({
+instance.web.ViewManagerAction = instance.web.ViewManager.extend({
     template:"ViewManagerAction",
     /**
-     * @constructs session.web.ViewManagerAction
-     * @extends session.web.ViewManager
+     * @constructs instance.web.ViewManagerAction
+     * @extends instance.web.ViewManager
      *
-     * @param {session.web.ActionManager} parent parent object/widget
+     * @param {instance.web.ActionManager} parent parent object/widget
      * @param {Object} action descriptor for the action this viewmanager needs to manage its views.
      */
     init: function(parent, action) {
@@ -466,7 +466,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
         this._super(parent, null, action.views, flags);
         this.session = parent.session;
         this.action = action;
-        var dataset = new session.web.DataSetSearch(this, action.res_model, action.context, action.domain);
+        var dataset = new instance.web.DataSetSearch(this, action.res_model, action.context, action.domain);
         if (action.res_id) {
             dataset.ids.push(action.res_id);
             dataset.index = 0;
@@ -507,7 +507,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
         this.$element.find('.oe_debug_view').change(this.on_debug_changed);
 
         if (this.action.help && !this.flags.low_profile) {
-            var Users = new session.web.DataSet(self, 'res.users'),
+            var Users = new instance.web.DataSet(self, 'res.users'),
                 $tips = this.$element.find('.oe_view_manager_menu_tips');
             $tips.delegate('blockquote button', 'click', function() {
                 var $this = $(this);
@@ -541,19 +541,19 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
             current_view = this.views[this.active_view].controller;
         switch (val) {
             case 'fvg':
-                var dialog = new session.web.Dialog(this, { title: _t("Fields View Get"), width: '95%' }).open();
-                $('<pre>').text(session.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$element);
+                var dialog = new instance.web.Dialog(this, { title: _t("Fields View Get"), width: '95%' }).open();
+                $('<pre>').text(instance.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$element);
                 break;
             case 'perm_read':
                 var ids = current_view.get_selected_ids();
                 if (ids.length === 1) {
                     this.dataset.call('perm_read', [ids]).then(function(result) {
-                        var dialog = new session.web.Dialog(this, {
+                        var dialog = new instance.web.Dialog(this, {
                             title: _.str.sprintf(_t("View Log (%s)"), self.dataset.model),
                             width: 400
                         }, QWeb.render('ViewManagerDebugViewLog', {
                             perm : result[0],
-                            format : session.web.format_value
+                            format : instance.web.format_value
                         })).open();
                     });
                 }
@@ -578,7 +578,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
                                 .append($('<dd style="white-space: pre-wrap;">').text(def));
                         });
                     });
-                    new session.web.Dialog(self, {
+                    new instance.web.Dialog(self, {
                         title: _.str.sprintf(_t("Model %s fields"),
                                              self.dataset.model),
                         width: '95%'}, $root).open();
@@ -586,7 +586,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
                 break;
             case 'manage_views':
                 if (current_view.fields_view && current_view.fields_view.arch) {
-                    var view_editor = new session.web.ViewEditor(current_view, current_view.$element, this.dataset, current_view.fields_view.arch);
+                    var view_editor = new instance.web.ViewEditor(current_view, current_view.$element, this.dataset, current_view.fields_view.arch);
                     view_editor.start();
                 } else {
                     this.do_warn(_t("Manage Views"),
@@ -723,7 +723,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
     }
 });
 
-session.web.Sidebar = session.web.Widget.extend({
+instance.web.Sidebar = instance.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
         var view = this.getParent();
@@ -832,7 +832,7 @@ session.web.Sidebar = session.web.Widget.extend({
         self.getParent().sidebar_context().then(function (context) {
             var ids = self.getParent().get_selected_ids();
             if (ids.length == 0) {
-                session.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
+                instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
                 return false;
             }
             var additional_context = _.extend({
@@ -860,7 +860,7 @@ session.web.Sidebar = session.web.Widget.extend({
             this.on_attachments_loaded([]);
         } else {
             var dom = [ ['res_model', '=', dataset.model], ['res_id', '=', model_id], ['type', 'in', ['binary', 'url']] ];
-            var ds = new session.web.DataSetSearch(this, 'ir.attachment', dataset.get_context(), dom);
+            var ds = new instance.web.DataSetSearch(this, 'ir.attachment', dataset.get_context(), dom);
             ds.read_slice(['name', 'url', 'type'], {}).then(this.on_attachments_loaded);
         }
     },
@@ -908,7 +908,7 @@ session.web.Sidebar = session.web.Widget.extend({
     }
 });
 
-session.web.TranslateDialog = session.web.Dialog.extend({
+instance.web.TranslateDialog = instance.web.Dialog.extend({
     dialog_title: {toString: function () { return _t("Translations"); }},
     init: function(view) {
         // TODO fme: should add the language to fields_view_get because between the fields view get
@@ -928,14 +928,14 @@ session.web.TranslateDialog = session.web.Dialog.extend({
         this.translatable_fields_keys = _.map(this.view.translatable_fields || [], function(i) { return i.name });
         this.languages = null;
         this.languages_loaded = $.Deferred();
-        (new session.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
+        (new instance.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
             [['translatable', '=', '1']])).read_slice(['code', 'name'], { sort: 'id' }).then(this.on_languages_loaded);
     },
     start: function() {
         var self = this;
         this._super();
         $.when(this.languages_loaded).then(function() {
-            self.$element.html(session.web.qweb.render('TranslateDialog', { widget: self }));
+            self.$element.html(instance.web.qweb.render('TranslateDialog', { widget: self }));
             self.$fields_form = self.$element.find('.oe_translation_form');
             self.$fields_form.find('.oe_trad_field').change(function() {
                 $(this).toggleClass('touched', ($(this).val() != $(this).attr('data-value')));
@@ -1024,7 +1024,7 @@ session.web.TranslateDialog = session.web.Dialog.extend({
     }
 });
 
-session.web.View = session.web.Widget.extend({
+instance.web.View = instance.web.Widget.extend({
     template: "EmptyComponent",
     // name displayed in view switchers
     display_name: '',
@@ -1048,7 +1048,7 @@ session.web.View = session.web.Widget.extend({
             $.async_when().then(function() {def.resolve(self.embedded_view);});
             return def.pipe(this.on_loaded);
         } else {
-            var context = new session.web.CompoundContext(this.dataset.get_context());
+            var context = new instance.web.CompoundContext(this.dataset.get_context());
             if (! this.view_type)
                 console.warn("view_type is not defined", this);
             return this.rpc("/web/view/load", {
@@ -1079,7 +1079,7 @@ session.web.View = session.web.Widget.extend({
     },
     open_translate_dialog: function(field) {
         if (!this.translate_dialog) {
-            this.translate_dialog = new session.web.TranslateDialog(this).start();
+            this.translate_dialog = new instance.web.TranslateDialog(this).start();
         }
         this.translate_dialog.open(field);
     },
@@ -1091,7 +1091,7 @@ session.web.View = session.web.Widget.extend({
      * @param {String} [action_data.special=null] special action handlers (currently: only ``'cancel'``)
      * @param {String} [action_data.type='workflow'] the action type, if present, one of ``'object'``, ``'action'`` or ``'workflow'``
      * @param {Object} [action_data.context=null] additional action context, to add to the current context
-     * @param {session.web.DataSet} dataset a dataset object used to communicate with the server
+     * @param {instance.web.DataSet} dataset a dataset object used to communicate with the server
      * @param {Object} [record_id] the identifier of the object on which the action is to be applied
      * @param {Function} on_closed callback to execute when dialog is closed or when the action does not generate any result (no new action)
      */
@@ -1103,12 +1103,12 @@ session.web.View = session.web.Widget.extend({
                 return self.getParent().on_action_executed.apply(null, arguments);
             }
         };
-        var context = new session.web.CompoundContext(dataset.get_context(), action_data.context || {});
+        var context = new instance.web.CompoundContext(dataset.get_context(), action_data.context || {});
 
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {
-                var ncontext = new session.web.CompoundContext(context);
+                var ncontext = new instance.web.CompoundContext(context);
                 if (record_id) {
                     ncontext.add({
                         active_id: record_id,
@@ -1157,7 +1157,7 @@ session.web.View = session.web.Widget.extend({
     /**
      * Directly set a view to use instead of calling fields_view_get. This method must
      * be called before start(). When an embedded view is set, underlying implementations
-     * of session.web.View must use the provided view instead of any other one.
+     * of instance.web.View must use the provided view instead of any other one.
      *
      * @param embedded_view A view.
      */
@@ -1197,11 +1197,11 @@ session.web.View = session.web.Widget.extend({
     do_search: function(view) {
     },
     on_sidebar_import: function() {
-        var import_view = new session.web.DataImport(this, this.dataset);
+        var import_view = new instance.web.DataImport(this, this.dataset);
         import_view.start();
     },
     on_sidebar_export: function() {
-        var export_view = new session.web.DataExport(this, this.dataset);
+        var export_view = new instance.web.DataExport(this, this.dataset);
         export_view.start();
     },
     on_sidebar_translate: function() {
@@ -1226,7 +1226,7 @@ session.web.View = session.web.Widget.extend({
     }
 });
 
-session.web.xml_to_json = function(node) {
+instance.web.xml_to_json = function(node) {
     switch (node.nodeType) {
         case 3:
         case 4:
@@ -1244,11 +1244,11 @@ session.web.xml_to_json = function(node) {
             return {
                 tag: node.tagName.toLowerCase(),
                 attrs: attrs,
-                children: _.map(node.childNodes, session.web.xml_to_json)
+                children: _.map(node.childNodes, instance.web.xml_to_json)
             }
     }
 }
-session.web.json_node_to_xml = function(node, human_readable, indent) {
+instance.web.json_node_to_xml = function(node, human_readable, indent) {
     // For debugging purpose, this function will convert a json node back to xml
     // Maybe useful for xml view editor
     indent = indent || 0;
@@ -1277,7 +1277,7 @@ session.web.json_node_to_xml = function(node, human_readable, indent) {
         r += '>' + cr;
         var childs = [];
         for (var i = 0, ii = node.children.length; i < ii; i++) {
-            childs.push(session.web.json_node_to_xml(node.children[i], human_readable, indent + 1));
+            childs.push(instance.web.json_node_to_xml(node.children[i], human_readable, indent + 1));
         }
         r += childs.join(cr);
         r += cr + sindent + '</' + node.tag + '>';
@@ -1286,14 +1286,14 @@ session.web.json_node_to_xml = function(node, human_readable, indent) {
         return r + '/>';
     }
 }
-session.web.xml_to_str = function(node) {
+instance.web.xml_to_str = function(node) {
     if (window.ActiveXObject) {
         return node.xml;
     } else {
         return (new XMLSerializer()).serializeToString(node);
     }
 }
-session.web.str_to_xml = function(s) {
+instance.web.str_to_xml = function(s) {
     if (window.DOMParser) {
         var dp = new DOMParser();
         var r = dp.parseFromString(s, "text/xml");
@@ -1317,12 +1317,12 @@ session.web.str_to_xml = function(s) {
 /**
  * Registry for all the client actions key: tag value: widget
  */
-session.web.client_actions = new session.web.Registry();
+instance.web.client_actions = new instance.web.Registry();
 
 /**
  * Registry for all the main views
  */
-session.web.views = new session.web.Registry();
+instance.web.views = new instance.web.Registry();
 
 };
 

From 13e64388249c6c3ad6ff86c0109914a02fb25e6a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:26:11 +0200
Subject: [PATCH 80/90] [imp] further more into the refactoring

bzr revid: nicolas.vanhoren@openerp.com-20120417122611-ftc4vuct77bldhts
---
 addons/web_calendar/static/src/js/calendar.js | 40 ++++++-------
 .../web_dashboard/static/src/js/dashboard.js  | 60 +++++++++----------
 addons/web_diagram/static/src/js/diagram.js   | 24 ++++----
 3 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index ed88be3fe4a..fe261ba6fec 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -2,12 +2,12 @@
  * OpenERP web_calendar
  *---------------------------------------------------------*/
 
-openerp.web_calendar = function(openerp) {
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
-openerp.web.views.add('calendar', 'openerp.web_calendar.CalendarView');
-openerp.web_calendar.CalendarView = openerp.web.View.extend({
+openerp.web_calendar = function(instance) {
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
+instance.web.views.add('calendar', 'instance.web_calendar.CalendarView');
+instance.web_calendar.CalendarView = instance.web.View.extend({
     display_name: _lt('Calendar'),
 // Dhtmlx scheduler ?
     init: function(parent, dataset, view_id, options) {
@@ -22,7 +22,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.has_been_loaded = $.Deferred();
         this.creating_event_id = null;
         this.dataset_events = [];
-        this.form_dialog = new openerp.web_calendar.CalendarFormDialog(this, {
+        this.form_dialog = new instance.web_calendar.CalendarFormDialog(this, {
                 destroy_on_close: false,
                 width: '80%',
                 min_width: 850
@@ -103,7 +103,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.init_scheduler();
 
         if (this.options.sidebar) {
-            this.sidebar = new openerp.web_calendar.Sidebar(this);
+            this.sidebar = new instance.web_calendar.Sidebar(this);
             this.has_been_loaded.pipe(this.sidebar.appendTo(this.$element));
         }
 
@@ -207,10 +207,10 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
             }
 
             if (this.fields[this.date_start]['type'] == 'date') {
-                evt[this.date_start] = openerp.web.auto_str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
+                evt[this.date_start] = instance.web.auto_str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
             }
             if (this.date_stop && evt[this.date_stop] && this.fields[this.date_stop]['type'] == 'date') {
-                evt[this.date_stop] = openerp.web.auto_str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss');
+                evt[this.date_stop] = instance.web.auto_str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss');
             }
             res_events.push(this.convert_event(evt));
         }
@@ -222,8 +222,8 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         }
     },
     convert_event: function(evt) {
-        var date_start = openerp.web.str_to_datetime(evt[this.date_start]),
-            date_stop = this.date_stop ? openerp.web.str_to_datetime(evt[this.date_stop]) : null,
+        var date_start = instance.web.str_to_datetime(evt[this.date_start]),
+            date_stop = this.date_stop ? instance.web.str_to_datetime(evt[this.date_stop]) : null,
             date_delay = evt[this.date_delay] || 1.0,
             res_text = '',
             res_description = [];
@@ -354,9 +354,9 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         var data = {
             name: event_obj.text
         };
-        data[this.date_start] = openerp.web.datetime_to_str(event_obj.start_date);
+        data[this.date_start] = instance.web.datetime_to_str(event_obj.start_date);
         if (this.date_stop) {
-            data[this.date_stop] = openerp.web.datetime_to_str(event_obj.end_date);
+            data[this.date_stop] = instance.web.datetime_to_str(event_obj.end_date);
         }
         if (this.date_delay) {
             var diff_seconds = Math.round((event_obj.end_date.getTime() - event_obj.start_date.getTime()) / 1000);
@@ -383,7 +383,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         });
     },
     get_range_domain: function() {
-        var format = openerp.web.date_to_str,
+        var format = instance.web.date_to_str,
             domain = this.last_search[0].slice(0);
         domain.unshift([this.date_start, '>=', format(this.range_start.clone().addDays(-6))]);
         domain.unshift([this.date_start, '<=', format(this.range_stop.clone().addDays(6))]);
@@ -402,7 +402,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
     }
 });
 
-openerp.web_calendar.CalendarFormDialog = openerp.web.Dialog.extend({
+instance.web_calendar.CalendarFormDialog = instance.web.Dialog.extend({
     init: function(view, options, view_id, dataset) {
         this._super(view, options);
         this.dataset = dataset;
@@ -412,7 +412,7 @@ openerp.web_calendar.CalendarFormDialog = openerp.web.Dialog.extend({
     start: function() {
         var self = this;
         this._super();
-        this.form = new openerp.web.FormView(this, this.dataset, this.view_id, {
+        this.form = new instance.web.FormView(this, this.dataset, this.view_id, {
             sidebar: false,
             pager: false
         });
@@ -440,7 +440,7 @@ openerp.web_calendar.CalendarFormDialog = openerp.web.Dialog.extend({
     }
 });
 
-openerp.web_calendar.Sidebar = openerp.web.Widget.extend({
+instance.web_calendar.Sidebar = instance.web.Widget.extend({
     template: 'CalendarView.sidebar',
     start: function() {
         this._super();
@@ -452,11 +452,11 @@ openerp.web_calendar.Sidebar = openerp.web.Widget.extend({
                 scheduler.setCurrentView(date, 'day');
             }
         });
-        this.filter = new openerp.web_calendar.SidebarFilter(this, this.getParent());
+        this.filter = new instance.web_calendar.SidebarFilter(this, this.getParent());
         this.filter.appendTo(this.$element.find('.oe_calendar_filter'));
     }
 });
-openerp.web_calendar.SidebarFilter = openerp.web.Widget.extend({
+instance.web_calendar.SidebarFilter = instance.web.Widget.extend({
     init: function(parent, view) {
         this._super(parent);
         this.view = view;
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index 2de8a04141e..f0c04d6d270 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -1,13 +1,13 @@
-openerp.web_dashboard = function(openerp) {
-var QWeb = openerp.web.qweb,
-    _t = openerp.web._t;
+openerp.web_dashboard = function(instance) {
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 
-if (!openerp.web_dashboard) {
+if (!instance.web_dashboard) {
     /** @namespace */
-    openerp.web_dashboard = {};
+    instance.web_dashboard = {};
 }
 
-openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
+instance.web.form.DashBoard = instance.web.form.Widget.extend({
     init: function(view, node) {
         this._super(view, node);
         this.form_template = 'DashBoard';
@@ -56,7 +56,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
         var qdict = {
             current_layout : this.$element.find('.oe-dashboard').attr('data-layout')
         };
-        var $dialog = openerp.web.dialog($('<div>'), {
+        var $dialog = instance.web.dialog($('<div>'), {
                             modal: true,
                             title: _t("Edit Layout"),
                             width: 'auto',
@@ -188,7 +188,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
                 selectable: false
             }
         };
-        var am = new openerp.web.ActionManager(this),
+        var am = new instance.web.ActionManager(this),
             // FIXME: ideally the dashboard view shall be refactored like kanban.
             $action = $('#' + this.view.element_id + '_action_' + index);
         $action.parent().data('action_attrs', action_attrs);
@@ -249,7 +249,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
         action_manager.do_action(view_manager.action);
     }
 });
-openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({
+instance.web.form.DashBoardLegacy = instance.web.form.DashBoard.extend({
     renderElement: function() {
         if (this.node.tag == 'hpaned') {
             this.node.attrs.style = '2-1';
@@ -273,25 +273,25 @@ openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({
     }
 });
 
-openerp.web.form.tags.add('hpaned', 'openerp.web.form.DashBoardLegacy');
-openerp.web.form.tags.add('vpaned', 'openerp.web.form.DashBoardLegacy');
-openerp.web.form.tags.add('board', 'openerp.web.form.DashBoard');
+instance.web.form.tags.add('hpaned', 'instance.web.form.DashBoardLegacy');
+instance.web.form.tags.add('vpaned', 'instance.web.form.DashBoardLegacy');
+instance.web.form.tags.add('board', 'instance.web.form.DashBoard');
 
 /*
  * ConfigOverview
  * This client action designed to be used as a dashboard widget display
  * ir.actions.todo in a fancy way
  */
-openerp.web.client_actions.add( 'board.config.overview', 'openerp.web_dashboard.ConfigOverview');
-openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({
+instance.web.client_actions.add( 'board.config.overview', 'instance.web_dashboard.ConfigOverview');
+instance.web_dashboard.ConfigOverview = instance.web.View.extend({
     template: 'ConfigOverview',
     init: function (parent) {
         this._super(parent);
-        this.user = _.extend(new openerp.web.DataSet(this, 'res.users'), {
+        this.user = _.extend(new instance.web.DataSet(this, 'res.users'), {
             index: 0,
             ids: [this.session.uid]
         });
-        this.dataset = new openerp.web.DataSetSearch(this, 'ir.actions.todo');
+        this.dataset = new instance.web.DataSetSearch(this, 'ir.actions.todo');
     },
     start: function () {
         var self = this;
@@ -363,15 +363,15 @@ openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({
  * This client action designed to be used as a dashboard widget display
  * the html content of a res_widget given as argument
  */
-openerp.web.client_actions.add( 'board.home.widgets', 'openerp.web_dashboard.Widget');
-openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_dashboard.Widgets# */{
+instance.web.client_actions.add( 'board.home.widgets', 'instance.web_dashboard.Widget');
+instance.web_dashboard.Widget = instance.web.View.extend(/** @lends instance.web_dashboard.Widgets# */{
     template: 'HomeWidget',
     /**
      * Initializes a "HomeWidget" client widget: handles the display of a given
      * res.widget objects in an OpenERP view (mainly a dashboard).
      *
-     * @constructs openerp.web_dashboard.Widget
-     * @extends openerp.web.View
+     * @constructs instance.web_dashboard.Widget
+     * @extends instance.web.View
      *
      * @param {Object} parent
      * @param {Object} options
@@ -382,7 +382,7 @@ openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_da
         this.widget_id = options.widget_id;
     },
     start: function () {
-        var ds = new openerp.web.DataSet(this, 'res.widget');
+        var ds = new instance.web.DataSet(this, 'res.widget');
         return ds.read_ids([this.widget_id], ['title']).then(this.on_widget_loaded);
     },
     on_widget_loaded: function (widgets) {
@@ -401,8 +401,8 @@ openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_da
  * HomeTiles this client action display either the list of application to
  * install (if none is installed yet) or a list of root menu items
  */
-openerp.web.client_actions.add('default_home', 'session.web_dashboard.ApplicationTiles');
-openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({
+instance.web.client_actions.add('default_home', 'session.web_dashboard.ApplicationTiles');
+instance.web_dashboard.ApplicationTiles = instance.web.OldWidget.extend({
     template: 'web_dashboard.ApplicationTiles',
     init: function(parent) {
         this._super(parent);
@@ -410,7 +410,7 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({
     start: function() {
         var self = this;
         var domain = [['application','=',true], ['state','=','installed'], ['name', '!=', 'base']];
-        var ds = new openerp.web.DataSetSearch(this, 'ir.module.module',{},domain);
+        var ds = new instance.web.DataSetSearch(this, 'ir.module.module',{},domain);
         ds.read_slice(['id']).then(function(result) {
             if(result.length) {
                 self.on_installed_database();
@@ -420,17 +420,17 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({
         });
     },
     on_uninstalled_database: function() {
-        installer = new openerp.web_dashboard.ApplicationInstaller(this);
+        installer = new instance.web_dashboard.ApplicationInstaller(this);
         installer.appendTo(this.$element);
     },
     on_installed_database: function() {
         var self = this;
         self.rpc('/web/menu/get_user_roots', {}).then(function (menu_ids) {
-            var menuds = new openerp.web.DataSet(this, 'ir.ui.menu',{})
+            var menuds = new instance.web.DataSet(this, 'ir.ui.menu',{})
                 .read_ids(menu_ids, ['name', 'web_icon_data', 'web_icon_hover_data', 'module']).then(function (applications) {
                     var tiles = QWeb.render('ApplicationTiles.content', {applications: applications});
                     $(tiles).appendTo(self.$element).find('.oe_install-module-link').click(function () {
-                        openerp.webclient.menu.on_menu_click(null, $(this).data('menu'))
+                        instance.webclient.menu.on_menu_click(null, $(this).data('menu'))
                     });
                 });
         });
@@ -441,13 +441,13 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({
  * ApplicationInstaller
  * This client action  display a list of applications to install.
  */
-openerp.web.client_actions.add( 'board.application.installer', 'openerp.web_dashboard.ApplicationInstaller');
-openerp.web_dashboard.ApplicationInstaller = openerp.web.OldWidget.extend({
+instance.web.client_actions.add( 'board.application.installer', 'instance.web_dashboard.ApplicationInstaller');
+instance.web_dashboard.ApplicationInstaller = instance.web.OldWidget.extend({
     template: 'web_dashboard.ApplicationInstaller',
     start: function () {
         // TODO menu hide
         var r = this._super();
-        this.action_manager = new openerp.web.ActionManager(this);
+        this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.$element.find('.oe_installer'));
         this.action_manager.do_action({
             type: 'ir.actions.act_window',
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index a38031ed4f3..ddbd385cb84 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -2,12 +2,12 @@
  * OpenERP diagram library
  *---------------------------------------------------------*/
 
-openerp.web_diagram = function (openerp) {
-var QWeb = openerp.web.qweb,
-      _t = openerp.web._t,
-     _lt = openerp.web._lt;
-openerp.web.views.add('diagram', 'openerp.web.DiagramView');
-openerp.web.DiagramView = openerp.web.View.extend({
+openerp.web_diagram = function (instance) {
+var QWeb = instance.web.qweb,
+      _t = instance.web._t,
+     _lt = instance.web._lt;
+instance.web.views.add('diagram', 'instance.web.DiagramView');
+instance.web.DiagramView = instance.web.View.extend({
     display_name: _lt('Diagram'),
     searchable: false,
     init: function(parent, dataset, view_id, options) {
@@ -194,7 +194,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
             if(!confirm(_t("Deleting this node cannot be undone.\nIt will also delete all connected transitions.\n\nAre you sure ?"))){
                 return $.Deferred().reject().promise();
             }
-            return new openerp.web.DataSet(self,self.node).unlink([cutenode.id]);
+            return new instance.web.DataSet(self,self.node).unlink([cutenode.id]);
         };
         CuteEdge.double_click_callback = function(cuteedge){
             self.edit_connector(cuteedge.id);
@@ -212,7 +212,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
             if(!confirm(_t("Deleting this transition cannot be undone.\n\nAre you sure ?"))){
                 return $.Deferred().reject().promise();
             }
-            return new openerp.web.DataSet(self,self.connector).unlink([cuteedge.id]);
+            return new instance.web.DataSet(self,self.connector).unlink([cuteedge.id]);
         };
 
     },
@@ -221,7 +221,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
     edit_node: function(node_id){
         var self = this;
         var title = _t('Activity');
-        var pop = new openerp.web.form.FormOpenPopup(self);
+        var pop = new instance.web.form.FormOpenPopup(self);
 
         pop.show_element(
                 self.node,
@@ -254,7 +254,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
     add_node: function(){
         var self = this;
         var title = _t('Activity');
-        var pop = new openerp.web.form.SelectCreatePopup(self);
+        var pop = new instance.web.form.SelectCreatePopup(self);
         pop.select_element(
             self.node,
             {
@@ -286,7 +286,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
     edit_connector: function(connector_id){
         var self = this;
         var title = _t('Transition');
-        var pop = new openerp.web.form.FormOpenPopup(self);
+        var pop = new instance.web.form.FormOpenPopup(self);
         pop.show_element(
             self.connector,
             parseInt(connector_id,10),      //FIXME Isn't connector_id supposed to be an int ?
@@ -305,7 +305,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
     add_connector: function(node_source_id, node_dest_id, dummy_cuteedge){
         var self = this;
         var title = _t('Transition');
-        var pop = new openerp.web.form.SelectCreatePopup(self);
+        var pop = new instance.web.form.SelectCreatePopup(self);
 
         pop.select_element(
             self.connector,

From eab7adeacf3268836caf8d95d403f0aabc825dca Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:48:30 +0200
Subject: [PATCH 81/90] [imp] remaining of refactoring for 'openerp'

bzr revid: nicolas.vanhoren@openerp.com-20120417124830-6vy3nsjch3w94rt2
---
 addons/web_gantt/static/src/js/gantt.js       | 28 +++++------
 addons/web_graph/static/src/js/graph.js       | 10 ++--
 addons/web_hello/static/openerp/base_hello.js |  6 +--
 addons/web_kanban/static/src/js/kanban.js     | 44 ++++++++---------
 .../web_mobile/static/src/js/chrome_mobile.js | 48 +++++++++----------
 .../web_mobile/static/src/js/form_mobile.js   | 20 ++++----
 .../web_mobile/static/src/js/list_mobile.js   | 10 ++--
 addons/web_process/static/src/js/process.js   | 22 ++++-----
 addons/web_tests/static/src/js/web_tests.js   | 14 +++---
 9 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 132d95e309e..5643e0cefb3 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -1,13 +1,13 @@
 /*---------------------------------------------------------
  * OpenERP web_gantt
  *---------------------------------------------------------*/
-openerp.web_gantt = function (openerp) {
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
-openerp.web.views.add('gantt', 'openerp.web_gantt.GanttView');
+openerp.web_gantt = function (instance) {
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
+instance.web.views.add('gantt', 'instance.web_gantt.GanttView');
 
-openerp.web_gantt.GanttView = openerp.web.View.extend({
+instance.web_gantt.GanttView = instance.web.View.extend({
     display_name: _lt('Gantt'),
     template: "GanttView",
     view_type: "gantt",
@@ -122,7 +122,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
                     return memo === undefined || date > memo ? date : memo;
                 }, undefined);
                 var duration = (task_stop.getTime() - task_start.getTime()) / (1000 * 60 * 60);
-                var group_name = openerp.web.format_value(task.name, self.fields[group_bys[level]]);
+                var group_name = instance.web.format_value(task.name, self.fields[group_bys[level]]);
                 if (level == 0) {
                     var group = new GanttProjectInfo(_.uniqueId("gantt_project_"), group_name, task_start);
                     _.each(task_infos, function(el) {
@@ -138,16 +138,16 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
                 }
             } else {
                 var task_name = task.__name;
-                var task_start = openerp.web.auto_str_to_date(task[self.fields_view.arch.attrs.date_start]);
+                var task_start = instance.web.auto_str_to_date(task[self.fields_view.arch.attrs.date_start]);
                 if (!task_start)
                     return;
                 var task_stop;
                 if (self.fields_view.arch.attrs.date_stop) {
-                    task_stop = openerp.web.auto_str_to_date(task[self.fields_view.arch.attrs.date_stop]);
+                    task_stop = instance.web.auto_str_to_date(task[self.fields_view.arch.attrs.date_stop]);
                     if (!task_stop)
                         return;
                 } else { // we assume date_duration is defined
-                    var tmp = openerp.web.format_value(task[self.fields_view.arch.attrs.date_delay],
+                    var tmp = instance.web.format_value(task[self.fields_view.arch.attrs.date_delay],
                         self.fields[self.fields_view.arch.attrs.date_delay]);
                     if (!tmp)
                         return;
@@ -197,10 +197,10 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
         var end = start.clone().addMilliseconds(duration * 60 * 60 * 1000);
         var data = {};
         data[self.fields_view.arch.attrs.date_start] =
-            openerp.web.auto_date_to_str(start, self.fields[self.fields_view.arch.attrs.date_start].type);
+            instance.web.auto_date_to_str(start, self.fields[self.fields_view.arch.attrs.date_start].type);
         if (self.fields_view.arch.attrs.date_stop) {
             data[self.fields_view.arch.attrs.date_stop] = 
-                openerp.web.auto_date_to_str(end, self.fields[self.fields_view.arch.attrs.date_stop].type);
+                instance.web.auto_date_to_str(end, self.fields[self.fields_view.arch.attrs.date_stop].type);
         } else { // we assume date_duration is defined
             data[self.fields_view.arch.attrs.date_delay] = duration;
         }
@@ -210,7 +210,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
     },
     on_task_display: function(task) {
         var self = this;
-        var pop = new openerp.web.form.FormOpenPopup(self);
+        var pop = new instance.web.form.FormOpenPopup(self);
         pop.on_write_completed.add_last(function() {
             self.reload();
         });
@@ -223,7 +223,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
     },
     on_task_create: function() {
         var self = this;
-        var pop = new openerp.web.form.SelectCreatePopup(this);
+        var pop = new instance.web.form.SelectCreatePopup(this);
         pop.on_select_elements.add_last(function() {
             self.reload();
         });
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index a55d8f15fbf..7016b9d8d85 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -2,7 +2,7 @@
  * OpenERP web_graph
  *---------------------------------------------------------*/
 
-openerp.web_graph = function (openerp) {
+openerp.web_graph = function (instance) {
 var COLOR_PALETTE = [
     '#cc99ff', '#ccccff', '#48D1CC', '#CFD784', '#8B7B8B', '#75507b',
     '#b0008c', '#ff0000', '#ff8e00', '#9000ff', '#0078ff', '#00ff00',
@@ -12,10 +12,10 @@ var COLOR_PALETTE = [
     '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f', '#f57900',
     '#cc0000', '#d400a8'];
 
-var QWeb = openerp.web.qweb,
-     _lt = openerp.web._lt;
-openerp.web.views.add('graph', 'openerp.web_graph.GraphView');
-openerp.web_graph.GraphView = openerp.web.View.extend({
+var QWeb = instance.web.qweb,
+     _lt = instance.web._lt;
+instance.web.views.add('graph', 'instance.web_graph.GraphView');
+instance.web_graph.GraphView = instance.web.View.extend({
     display_name: _lt('Graph'),
     view_type: "graph",
 
diff --git a/addons/web_hello/static/openerp/base_hello.js b/addons/web_hello/static/openerp/base_hello.js
index 91caf263196..a74b8ef8f2f 100644
--- a/addons/web_hello/static/openerp/base_hello.js
+++ b/addons/web_hello/static/openerp/base_hello.js
@@ -2,9 +2,9 @@
  * OpenERP base_hello (Example module)
  *---------------------------------------------------------*/
 
-openerp.web_hello = function(openerp) {
+openerp.web_hello = function(instance) {
 
-openerp.web.SearchView = openerp.web.SearchView.extend({
+instance.web.SearchView = instance.web.SearchView.extend({
     init:function() {
         this._super.apply(this,arguments);
         this.on_search.add(function(){console.log('hello');});
@@ -13,7 +13,7 @@ openerp.web.SearchView = openerp.web.SearchView.extend({
 
 // here you may tweak globals object, if any, and play with on_* or do_* callbacks on them
 
-openerp.web.Login = openerp.web.Login.extend({
+instance.web.Login = instance.web.Login.extend({
     start: function() {
         console.log('Hello there');
         this._super.apply(this,arguments);
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 1118c6388c8..d3ba0c74f5a 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1,11 +1,11 @@
-openerp.web_kanban = function (openerp) {
+openerp.web_kanban = function (instance) {
 
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
-openerp.web.views.add('kanban', 'openerp.web_kanban.KanbanView');
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
+instance.web.views.add('kanban', 'instance.web_kanban.KanbanView');
 
-openerp.web_kanban.KanbanView = openerp.web.View.extend({
+instance.web_kanban.KanbanView = instance.web.View.extend({
     template: "KanbanView",
     display_name: _lt('Kanban'),
     default_nr_columns: 3,
@@ -23,12 +23,12 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             records : {}
         };
         this.groups = [];
-        this.form_dialog = new openerp.web.form.FormDialog(this, {}, this.options.action_views_ids.form, dataset).start();
+        this.form_dialog = new instance.web.form.FormDialog(this, {}, this.options.action_views_ids.form, dataset).start();
         this.form_dialog.on_form_dialog_saved.add_last(this.do_reload);
         this.aggregates = {};
         this.group_operators = ['avg', 'max', 'min', 'sum', 'count'];
         this.qweb = new QWeb2.Engine();
-        this.qweb.debug = openerp.connection.debug;
+        this.qweb.debug = instance.connection.debug;
         this.qweb.default_dict = _.clone(QWeb.default_dict);
         this.has_been_loaded = $.Deferred();
         this.search_domain = this.search_context = this.search_group_by = null;
@@ -57,7 +57,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             var child = this.fields_view.arch.children[i];
             if (child.tag === "templates") {
                 this.transform_qweb_template(child);
-                this.qweb.add_template(openerp.web.json_node_to_xml(child));
+                this.qweb.add_template(instance.web.json_node_to_xml(child));
                 break;
             } else if (child.tag === 'field') {
                 this.extract_aggregates(child);
@@ -109,7 +109,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
                         node.children = [{
                             tag: 'img',
                             attrs: {
-                                src: openerp.connection.prefix + '/web/static/src/img/icons/' + node.attrs['data-icon'] + '.png',
+                                src: instance.connection.prefix + '/web/static/src/img/icons/' + node.attrs['data-icon'] + '.png',
                                 width: '16',
                                 height: '16'
                             }
@@ -141,7 +141,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
         this.search_group_by = group_by;
         $.when(this.has_been_loaded).then(function() {
             self.group_by = group_by.length ? group_by[0] : self.fields_view.arch.attrs.default_group_by;
-            self.datagroup = new openerp.web.DataGroup(self, self.dataset.model, domain, context, self.group_by ? [self.group_by] : []);
+            self.datagroup = new instance.web.DataGroup(self, self.dataset.model, domain, context, self.group_by ? [self.group_by] : []);
             self.datagroup.list(self.fields_keys, self.do_process_groups, self.do_process_dataset);
         });
     },
@@ -154,10 +154,10 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             var remaining = groups.length - 1,
                 groups_array = [];
             _.each(groups, function (group, index) {
-                var dataset = new openerp.web.DataSetSearch(self, self.dataset.model, group.context, group.domain);
+                var dataset = new instance.web.DataSetSearch(self, self.dataset.model, group.context, group.domain);
                 dataset.read_slice(self.fields_keys.concat(['__last_update']), { 'limit': self.limit }).then(function(records) {
                     self.dataset.ids.push.apply(self.dataset.ids, dataset.ids);
-                    groups_array[index] = new openerp.web_kanban.KanbanGroup(self, records, group, dataset);
+                    groups_array[index] = new instance.web_kanban.KanbanGroup(self, records, group, dataset);
                     if (!remaining--) {
                         self.dataset.index = self.dataset.size() ? 0 : null;
                         def.pipe(self.do_add_groups(groups_array));
@@ -175,7 +175,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             var def = $.Deferred();
             self.do_clear_groups();
             self.dataset.read_slice(self.fields_keys.concat(['__last_update']), { 'limit': self.limit }).then(function(records) {
-                var kgroup = new openerp.web_kanban.KanbanGroup(self, records, null, self.dataset);
+                var kgroup = new instance.web_kanban.KanbanGroup(self, records, null, self.dataset);
                 self.do_add_groups([kgroup]).then(function() {
                     def.resolve();
                 });
@@ -293,7 +293,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
     },
 });
 
-openerp.web_kanban.KanbanGroup = openerp.web.OldWidget.extend({
+instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
     template: 'KanbanView.group_header',
     init: function (parent, records, group, dataset) {
         var self = this;
@@ -315,7 +315,7 @@ openerp.web_kanban.KanbanGroup = openerp.web.OldWidget.extend({
             var field = this.view.fields_view.fields[this.view.group_by];
             if (field) {
                 try {
-                    this.title = openerp.web.format_value(group.value, field, false);
+                    this.title = instance.web.format_value(group.value, field, false);
                 } catch(e) {}
             }
             _.each(this.view.aggregates, function(value, key) {
@@ -376,7 +376,7 @@ openerp.web_kanban.KanbanGroup = openerp.web.OldWidget.extend({
     do_add_records: function(records) {
         var self = this;
         _.each(records, function(record) {
-            var rec = new openerp.web_kanban.KanbanRecord(self, record);
+            var rec = new instance.web_kanban.KanbanRecord(self, record);
             rec.insertBefore(self.$records.find('.oe_kanban_show_more'));
             self.records.push(rec);
         });
@@ -404,7 +404,7 @@ openerp.web_kanban.KanbanGroup = openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({
+instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
     template: 'KanbanView.record',
     init: function (parent, record) {
         this._super(parent);
@@ -434,11 +434,11 @@ openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({
         _.each(record, function(value, name) {
             var r = _.clone(self.view.fields_view.fields[name] || {});
             if ((r.type === 'date' || r.type === 'datetime') && value) {
-                r.raw_value = openerp.web.auto_str_to_date(value);
+                r.raw_value = instance.web.auto_str_to_date(value);
             } else {
                 r.raw_value = value;
             }
-            r.value = openerp.web.format_value(value, r);
+            r.value = instance.web.format_value(value, r);
             new_record[name] = r;
         });
         return new_record;
@@ -584,9 +584,9 @@ openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({
     },
     kanban_image: function(model, field, id) {
         id = id || '';
-        var url = openerp.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
+        var url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
         if (this.record.__last_update && this.record.__last_update.raw_value) {
-            var time = openerp.web.str_to_datetime(this.record.__last_update.raw_value).getTime();
+            var time = instance.web.str_to_datetime(this.record.__last_update.raw_value).getTime();
             url += '&t=' + time;
         }
         return url;
diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index a28956a0cab..a507e3b5943 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -2,36 +2,36 @@
  * OpenERP Web Mobile chrome
  *---------------------------------------------------------*/
 
-openerp.web_mobile.chrome_mobile = function(openerp) {
+openerp.web_mobile.chrome_mobile = function(instance) {
 
-openerp.web_mobile.mobilewebclient = function(element_id) {
-    // TODO Helper to start mobile webclient rename it openerp.web.webclient
-    var client = new openerp.web_mobile.MobileWebClient(element_id);
+instance.web_mobile.mobilewebclient = function(element_id) {
+    // TODO Helper to start mobile webclient rename it instance.web.webclient
+    var client = new instance.web_mobile.MobileWebClient(element_id);
     client.start();
     return client;
 };
 
-openerp.web_mobile.MobileWebClient = openerp.web.OldWidget.extend({
+instance.web_mobile.MobileWebClient = instance.web.OldWidget.extend({
 
     template: "WebClient",
 
     init: function(element_id) {
         this._super(null, element_id);
-        this.crashmanager =  new openerp.web.CrashManager(this);
-        this.login = new openerp.web_mobile.Login(this, "oe_login");
+        this.crashmanager =  new instance.web.CrashManager(this);
+        this.login = new instance.web_mobile.Login(this, "oe_login");
     },
     start: function() {
         this._super.apply(this, arguments);
         var self = this;
         this.session.bind_session().then(function() {
-            openerp.web.qweb.add_template("xml/web_mobile.xml");
+            instance.web.qweb.add_template("xml/web_mobile.xml");
             self.$element.html(self.render());
             self.login.start();
         });
     }
 });
 
-openerp.web_mobile.Login =  openerp.web.OldWidget.extend({
+instance.web_mobile.Login =  instance.web.OldWidget.extend({
 
     template: "Login",
 
@@ -103,7 +103,7 @@ openerp.web_mobile.Login =  openerp.web.OldWidget.extend({
             .addClass("login_valid");
             //.hide();
         if(!$('#oe_menu').html().length){
-            this.menu = new openerp.web_mobile.Menu(this, "oe_menu", "oe_secondary_menu");
+            this.menu = new instance.web_mobile.Menu(this, "oe_menu", "oe_secondary_menu");
             this.menu.start();
         }else{
             $.mobile.changePage("#oe_menu", "slide", false, true);
@@ -119,7 +119,7 @@ openerp.web_mobile.Login =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Header =  openerp.web.OldWidget.extend({
+instance.web_mobile.Header =  instance.web.OldWidget.extend({
 
     template: "Header",
 
@@ -131,7 +131,7 @@ openerp.web_mobile.Header =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Footer =  openerp.web.OldWidget.extend({
+instance.web_mobile.Footer =  instance.web.OldWidget.extend({
 
     template: "Footer",
 
@@ -143,7 +143,7 @@ openerp.web_mobile.Footer =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Shortcuts =  openerp.web.OldWidget.extend({
+instance.web_mobile.Shortcuts =  instance.web.OldWidget.extend({
 
     template: "Shortcuts",
 
@@ -171,7 +171,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.OldWidget.extend({
         res_id = $shortcut.data('res');
         if(!$('[id^="oe_list_'+res_id+'"]').html()){
             $('<div id="oe_list_'+res_id+'" data-role="page" data-url="oe_list_'+res_id+'"> </div>').appendTo('#moe');
-            this.listview = new openerp.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
+            this.listview = new instance.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
             this.listview.start();
         }else{
             $.mobile.changePage('#oe_list_'+res_id, "slide", false, true);
@@ -182,7 +182,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
+instance.web_mobile.Menu =  instance.web.OldWidget.extend({
 
     template: "Menu",
 
@@ -199,16 +199,16 @@ openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
     on_loaded: function(data) {
         var self = this;
         this.data = data;
-        this.header = new openerp.web_mobile.Header(this, "oe_header");
+        this.header = new instance.web_mobile.Header(this, "oe_header");
         this.header.start();
-        this.footer = new openerp.web_mobile.Footer(this, "oe_footer");
+        this.footer = new instance.web_mobile.Footer(this, "oe_footer");
         this.footer.start();
         this.$element.html(this.render(this.data));
         this.$element.find("[data-role=header]").find('h1').html('Applications');
         this.$element.find("[data-role=header]").find('#home').hide();
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
-                this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                this.shortcuts = new instance.web_mobile.Shortcuts(self, "oe_shortcuts");
                 this.shortcuts.start();
             }else{
                 $.mobile.changePage($("#oe_shortcuts"), "slide", false, true);
@@ -216,7 +216,7 @@ openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
         });
         this.$element.find("[data-role=footer]").find('#preference').click(function(){
             if(!$('#oe_options').html().length){
-                this.options = new openerp.web_mobile.Options(self, "oe_options");
+                this.options = new instance.web_mobile.Options(self, "oe_options");
                 this.options.start();
             }else{
                 $.mobile.changePage("#oe_options", "slide", false, true);
@@ -240,7 +240,7 @@ openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
             .addClass("secondary_menu");
         if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
             $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
-            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
+            this.secondary = new instance.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
             this.secondary.start();
         }else{
             $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
@@ -248,7 +248,7 @@ openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Secondary =  openerp.web.OldWidget.extend({
+instance.web_mobile.Secondary =  instance.web.OldWidget.extend({
 
     template: "Menu.secondary",
 
@@ -287,7 +287,7 @@ openerp.web_mobile.Secondary =  openerp.web.OldWidget.extend({
             .addClass("secondary_menu");
             if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
                 $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
-                this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
+                this.secondary = new instance.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
                 this.secondary.start();
             }else{
                 $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
@@ -295,7 +295,7 @@ openerp.web_mobile.Secondary =  openerp.web.OldWidget.extend({
         }else {
             if(!$('[id^="oe_list_'+id+'"]').html()){
                 $('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
-                this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
+                this.listview = new instance.web_mobile.ListView(this, "oe_list_"+id, id);
                 this.listview.start();
             }else{
                 $.mobile.changePage('#oe_list_'+id, "slide", false, true);
@@ -305,7 +305,7 @@ openerp.web_mobile.Secondary =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Options =  openerp.web.OldWidget.extend({
+instance.web_mobile.Options =  instance.web.OldWidget.extend({
 
     template: "Options",
 
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index cf44cca1879..c3c2025ac1f 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -2,9 +2,9 @@
  * OpenERP Web Mobile Form View
  *---------------------------------------------------------*/
 
-openerp.web_mobile.form_mobile = function (openerp) {
+openerp.web_mobile.form_mobile = function (instance) {
 
-openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
+instance.web_mobile.FormView = instance.web.OldWidget.extend({
 
     template: 'FormView',
 
@@ -25,8 +25,8 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
         }else{
             var view_id = this.viewid;
         }
-        this.dataset = new openerp.web.DataSetSearch(this, model, null, null);
-        var context = new openerp.web.CompoundContext(this.dataset.get_context());
+        this.dataset = new instance.web.DataSetSearch(this, model, null, null);
+        var context = new instance.web.CompoundContext(this.dataset.get_context());
         this.dataset.read_slice([]).then(function (result) {
             for (var i = 0; i < result.length; i++) {
                 if (result[i].id == id) {
@@ -71,14 +71,14 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
             var head = rel_field.string;
             if (rel_ids) {
                 var list_ids = [];
-                var datasearch = new openerp.web.DataSetSearch(self, rel_field.relation, rel_field.context);
+                var datasearch = new instance.web.DataSetSearch(self, rel_field.relation, rel_field.context);
                 datasearch.domain=[['id', 'in', rel_ids]];
                 datasearch.read_slice(['name'], {context:rel_field.context, domain: datasearch.domain, limit:80}).then(function(listrec){
                     _.each(listrec, function(i) {
                         list_ids.push(i.id);
                     });
                     _.extend(rel_field.context,{"html_name_get" : true});
-                    var dataset = new openerp.web.DataSet(self, rel_field.relation,rel_field.context);
+                    var dataset = new instance.web.DataSet(self, rel_field.relation,rel_field.context);
                     dataset.name_get(list_ids,function(res){
                         var additional = "";
                         if(res['html_name_get']){
@@ -86,7 +86,7 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
                         }
                         if(!$('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html()){
                             $('<div id="oe_list_'+relational+'_'+self.element_id+'" data-role="page" data-url="oe_list_'+relational+'_'+self.element_id+'"> </div>').appendTo('#moe');
-                            $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(openerp.web.qweb.render("ListView", {'records' : res,'data': additional}));
+                            $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(instance.web.qweb.render("ListView", {'records' : res,'data': additional}));
                             $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head);
                             $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){
                                 $.mobile.changePage("#oe_menu", "slide", false, true);
@@ -98,7 +98,7 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
                                 var listid = $(ev.currentTarget).data('id');
                                 if(!$('[id^="oe_form_'+listid+rel_field.relation+'"]').html()){
                                     $('<div id="oe_form_'+listid+rel_field.relation+'" data-role="page" data-url="oe_form_'+listid+rel_field.relation+'"> </div>').appendTo('#moe');
-                                        this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+listid+rel_field.relation, listid, '', head, rel_field.relation, false);
+                                        this.formview = new instance.web_mobile.FormView(self, "oe_form_"+listid+rel_field.relation, listid, '', head, rel_field.relation, false);
                                         this.formview.start();
                                 }else{
                                     $.mobile.changePage('#oe_form_'+listid+rel_field.relation, "slide", false, true);
@@ -126,7 +126,7 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
         if(selected_id){
             if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
                 $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                    this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
+                    this.formview = new instance.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
                     this.formview.start();
             }else{
                 $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
@@ -168,7 +168,7 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
                         // Temp: Set as disabled
                         $("#"+getfields[i].attrs.name).attr('disabled', 'true');
                         if(result.fields[getfields[i].attrs.name]){
-                            var dateresult = openerp.web.format_value(data[getfields[i].attrs.name], {"widget": result.fields[getfields[i].attrs.name].type});
+                            var dateresult = instance.web.format_value(data[getfields[i].attrs.name], {"widget": result.fields[getfields[i].attrs.name].type});
                             $(this).val(dateresult);
                         }
                     }
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 16296df59e7..abe5620a0a3 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -2,9 +2,9 @@
  * OpenERP Web Mobile List View
  *---------------------------------------------------------*/
 
-openerp.web_mobile.list_mobile = function (openerp) {
+openerp.web_mobile.list_mobile = function (instance) {
 
-openerp.web_mobile.ListView = openerp.web.OldWidget.extend({
+instance.web_mobile.ListView = instance.web.OldWidget.extend({
 
     template: 'ListView',
 
@@ -31,14 +31,14 @@ openerp.web_mobile.ListView = openerp.web.OldWidget.extend({
     on_search_data: function(ev){
         var self = this;
         var list_ids = [];
-        var datasearch = new openerp.web.DataSetSearch(self, self.action.res_model,self.action.context);
+        var datasearch = new instance.web.DataSetSearch(self, self.action.res_model,self.action.context);
         datasearch.domain = self.action.domain;
         datasearch.read_slice(['name'], {context:datasearch.context, domain: datasearch.domain, limit:80}).then(function(listresult){
             _.each(listresult, function(i) {
                 list_ids.push(i.id);
             });
             _.extend(self.action.context,{"html_name_get" : true});
-            var dataset = new openerp.web.DataSet(self, datasearch.model,datasearch.context);
+            var dataset = new instance.web.DataSet(self, datasearch.model,datasearch.context);
             dataset.name_get(list_ids,function(res){
                 var additional = "";
                 if(res['html_name_get']){
@@ -64,7 +64,7 @@ openerp.web_mobile.ListView = openerp.web.OldWidget.extend({
         head_title = $.trim($record.text());
         if(!$('[id^="oe_form_'+id+this.action.res_model+'"]').html()){
             $('<div id="oe_form_'+id+this.action.res_model+'" data-role="page" data-url="oe_form_'+id+this.action.res_model+'"> </div>').appendTo('#moe');
-            this.formview = new openerp.web_mobile.FormView(this, "oe_form_"+id+this.action.res_model, id, this.action, head_title, '' ,'');
+            this.formview = new instance.web_mobile.FormView(this, "oe_form_"+id+this.action.res_model, id, this.action, head_title, '' ,'');
             this.formview.start();
         }else{
             $.mobile.changePage('#oe_form_'+id+this.action.res_model, "slide", false, true);
diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js
index 4a731b9d3f6..85bb3447b71 100644
--- a/addons/web_process/static/src/js/process.js
+++ b/addons/web_process/static/src/js/process.js
@@ -1,7 +1,7 @@
-openerp.web_process = function (openerp) {
-    var QWeb = openerp.web.qweb,
-          _t = openerp.web._t;
-    openerp.web.ViewManager.include({
+openerp.web_process = function (instance) {
+    var QWeb = instance.web.qweb,
+          _t = instance.web._t;
+    instance.web.ViewManager.include({
         start: function() {
             this._super();
             this.process_check();
@@ -15,7 +15,7 @@ openerp.web_process = function (openerp) {
             grandparent = this.getParent() && this.getParent().getParent(),
             view = this.views[this.views_src[0].view_type],
             $process_view = this.$element.find('.oe-process-view');
-            if (!(grandparent instanceof openerp.web.WebClient) ||
+            if (!(grandparent instanceof instance.web.WebClient) ||
                 !(view.view_type === this.views_src[0].view_type
                     && view.view_id === this.views_src[0].view_id)) {
                         $process_view.hide();
@@ -86,7 +86,7 @@ openerp.web_process = function (openerp) {
             if(!this.subflow_model) {
                 def.resolve(this.action ? (this.action.help!=false ? this.action.help : 'Help: Not Defined') : 'Help: Not Defined');
             } else {
-                 var dataset = new openerp.web.DataSetSearch(this, "ir.actions.act_window", this.session.context, []);
+                 var dataset = new instance.web.DataSetSearch(this, "ir.actions.act_window", this.session.context, []);
                  dataset
                     .read_slice(['help'],
                     {
@@ -107,7 +107,7 @@ openerp.web_process = function (openerp) {
             if(this.process_id)
                 return def.resolve().promise();
 
-            this.process_dataset = new openerp.web.DataSetStatic(this, "process.process", this.session.context);
+            this.process_dataset = new instance.web.DataSetStatic(this, "process.process", this.session.context);
             this.process_dataset
             .call("search_by_model", [self.process_model,self.session.context])
             .done(function(res) {
@@ -237,7 +237,7 @@ openerp.web_process = function (openerp) {
         },
         jump_to_view: function(model, id) {
             var self = this;
-            var dataset = new openerp.web.DataSetStatic(this, 'ir.values', this.session.context);
+            var dataset = new instance.web.DataSetStatic(this, 'ir.values', this.session.context);
             dataset.call('get',
                 ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
                 function(res) {
@@ -246,7 +246,7 @@ openerp.web_process = function (openerp) {
                         action_id: action.id,
                         context: dataset.context
                         }, function(result) {
-                            var action_manager = new openerp.web.ActionManager(self);
+                            var action_manager = new instance.web.ActionManager(self);
                             action_manager.replace(self.$element);
                             action_manager.do_action(result.result);
                         });
@@ -254,8 +254,8 @@ openerp.web_process = function (openerp) {
         },
         edit_process_view: function() {
             var self = this;
-            var action_manager = new openerp.web.ActionManager(this);
-            var dialog = new openerp.web.Dialog(this, {
+            var action_manager = new instance.web.ActionManager(this);
+            var dialog = new instance.web.Dialog(this, {
                 width: 800,
                 buttons : [
                     {text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }},
diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js
index f98dd95f66f..e6e6079ede5 100644
--- a/addons/web_tests/static/src/js/web_tests.js
+++ b/addons/web_tests/static/src/js/web_tests.js
@@ -1,16 +1,16 @@
-openerp.web_tests = function (db) {
-    db.web.client_actions.add(
+openerp.web_tests = function (instance) {
+    instance.web.client_actions.add(
         'buncha-forms', 'instance.web_tests.BunchaForms');
-    db.web_tests = {};
-    db.web_tests.BunchaForms = db.web.OldWidget.extend({
+    instance.web_tests = {};
+    instance.web_tests.BunchaForms = instance.web.OldWidget.extend({
         init: function (parent) {
             this._super(parent);
-            this.dataset = new db.web.DataSetSearch(this, 'test.listview.relations');
-            this.form = new db.web.FormView(this, this.dataset, false, {
+            this.dataset = new instance.web.DataSetSearch(this, 'test.listview.relations');
+            this.form = new instance.web.FormView(this, this.dataset, false, {
                 action_buttons: false,
                 pager: false
             });
-            this.form.registry = db.web.form.readonly;
+            this.form.registry = instance.web.form.readonly;
         },
         render: function () {
             return '<div class="oe-bunchaforms"></div>';

From fe7b7d235d73ac04c7513f921f0e1fd5c9c86042 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 15:33:07 +0200
Subject: [PATCH 82/90] [imp] some improvements in fields to be less dependant
 of the view

bzr revid: nicolas.vanhoren@openerp.com-20120417133307-w1xrz3o3oz95172q
---
 addons/web/static/src/js/view_form.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index fdff2d95069..1ca04071cac 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -854,6 +854,12 @@ instance.web.FormView = instance.web.View.extend({
     register_field: function(field, name) {
         this.fields[name] = field;
         this.fields_order.push(name);
+        if (this.get_field(name).translate) {
+            translatable_fields.push(field);
+        }
+    },
+    get_field: function(field_name) {
+        return this.fields_view.fields[field_name];
     },
 });
 
@@ -1547,7 +1553,14 @@ instance.web.form.WidgetButton = instance.web.form.Widget.extend({
  *     this event is triggered all fields should reprocess their modifiers.
  */
 instance.web.form.FieldManagerInterface = {
-
+    /**
+     * Must return the asked field as in fields_get.
+     */
+    get_field: function(field_name) {},
+    /**
+     * Called by the field when the translate button is clicked.
+     */
+    open_translate_dialog: function(field) {},
 };
 
 /**
@@ -1628,9 +1641,10 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
      */
     init: function(field_manager, node) {
         this._super(field_manager, node);
+        this.field_manager = field_manager;
         this.name = this.node.attrs.name;
         this.value = false;
-        this.field = this.view.fields_view.fields[this.name] || {};
+        this.field = this.field_manager.get_field(this.name);
         this.set({required: this.modifiers['required'] === true});
         this.invalid = this.dirty = false;
         
@@ -1647,12 +1661,11 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     start: function() {
         this._super.apply(this, arguments);
         if (this.field.translate) {
-            this.view.translatable_fields.push(this);
             this.$element.addClass('oe_form_field_translatable');
             this.$element.find('.oe_field_translate').click(this.on_translate);
         }
-        if (this.node.attrs.nolabel && instance.connection.debug) {
-            this.do_attach_tooltip(this, this.$label || this.$element);
+        if (instance.connection.debug) {
+            this.do_attach_tooltip(this, this.$element);
         }
         if (!this.disable_utility_classes) {
             var set_required = function() {
@@ -1674,7 +1687,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     on_value_changed: function() {
     },
     on_translate: function() {
-        this.view.open_translate_dialog(this);
+        this.field_manager.open_translate_dialog(this);
     },
     get_value: function() {
         return this.value;

From f80c7eee961ace09a10673f39a25c78a917b9c3c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 15:32:42 +0200
Subject: [PATCH 83/90] [FIX] toolbar is optional

bzr revid: al@openerp.com-20120417133242-x76s3qfn28l40yzb
---
 addons/web/static/src/js/view_form.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1ca04071cac..0cde20535ad 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -112,7 +112,9 @@ instance.web.FormView = instance.web.View.extend({
         if (!this.sidebar && this.options.sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.$sidebar);
-            this.sidebar.add_toolbar(this.fields_view.toolbar);
+            if(this.fields_view.toolbar) {
+                this.sidebar.add_toolbar(this.fields_view.toolbar);
+            }
             this.sidebar.add_items('other', [{
                 label: _t('Set Default'),
                 form: this,

From 5584a2e6d68965fa5b03905366a9e7bb09dcc611 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 16:32:27 +0200
Subject: [PATCH 84/90] [imp] big refactoring of 'value' in form view

bzr revid: nicolas.vanhoren@openerp.com-20120417143227-qzez1yxysqnw0sbv
---
 addons/web/static/src/js/view_form.js | 279 +++++++++++++-------------
 1 file changed, 141 insertions(+), 138 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0cde20535ad..e79276458b3 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -152,14 +152,14 @@ instance.web.FormView = instance.web.View.extend({
     get_qweb_context: function(record) {
         var self = this,
             new_record = {};
-        _.each(record, function(value, name) {
+        _.each(record, function(value_, name) {
             var r = _.clone(self.fields_view.fields[name] || {});
-            if ((r.type === 'date' || r.type === 'datetime') && value) {
-                r.raw_value = instance.web.auto_str_to_date(value);
+            if ((r.type === 'date' || r.type === 'datetime') && value_) {
+                r.raw_value = instance.web.auto_str_to_date(value_);
             } else {
-                r.raw_value = value;
+                r.raw_value = value_;
             }
-            r.value = instance.web.format_value(value, r);
+            r.value = instance.web.format_value(value_, r);
             new_record[name] = r;
         });
         return {
@@ -357,8 +357,8 @@ instance.web.FormView = instance.web.View.extend({
             }
             // form field
             if (self.fields[field]) {
-                var value = self.fields[field].get_value();
-                return value == null ? false : value;
+                var value_ = self.fields[field].get_value();
+                return value_ == null ? false : value_;
             }
             // parent field
             var splitted = field.split('.');
@@ -421,17 +421,17 @@ instance.web.FormView = instance.web.View.extend({
                 }
 
                 if (widget.field['change_default']) {
-                    var fieldname = widget.name, value;
+                    var fieldname = widget.name, value_;
                     if (response.value && (fieldname in response.value)) {
                         // Use value from onchange if onchange executed
-                        value = response.value[fieldname];
+                        value_ = response.value[fieldname];
                     } else {
                         // otherwise get form value for field
-                        value = self.fields[fieldname].get_value();
+                        value_ = self.fields[fieldname].get_value();
                     }
-                    var condition = fieldname + '=' + value;
+                    var condition = fieldname + '=' + value_;
 
-                    if (value) {
+                    if (value_) {
                         can_process_onchange = self.rpc({
                             url: '/web/dataset/call',
                             async: false
@@ -472,9 +472,9 @@ instance.web.FormView = instance.web.View.extend({
                 var field = this.fields[f];
                 // If field is not defined in the view, just ignore it
                 if (field) {
-                    var value = result.value[f];
-                    if (field.get_value() != value) {
-                        field.set_value(value);
+                    var value_ = result.value[f];
+                    if (field.get_value() != value_) {
+                        field.set_value(value_);
                         field.dirty = true;
                         if (!_.contains(processed, field.name)) {
                             this.do_onchange(field, processed);
@@ -739,10 +739,10 @@ instance.web.FormView = instance.web.View.extend({
         var values = {};
         var ids = this.get_selected_ids();
         values["id"] = ids.length > 0 ? ids[0] : false;
-        _.each(this.fields, function(value, key) {
+        _.each(this.fields, function(value_, key) {
         	if (_.include(blacklist, key))
         		return;
-            var val = value.get_value();
+            var val = value_.get_value();
             values[key] = val;
         });
         return values;
@@ -759,8 +759,8 @@ instance.web.FormView = instance.web.View.extend({
         });
     },
     is_dirty: function() {
-        return _.any(this.fields, function (value) {
-            return value.is_dirty();
+        return _.any(this.fields, function (value_) {
+            return value_.is_dirty();
         });
     },
     is_interactible_record: function() {
@@ -781,10 +781,10 @@ instance.web.FormView = instance.web.View.extend({
         var self = this;
         var fields = _.chain(this.fields)
             .map(function (field, name) {
-                var value = field.get_value();
+                var value_ = field.get_value();
                 // ignore fields which are empty, invisible, readonly, o2m
                 // or m2m
-                if (!value
+                if (!value_
                         || field.get('invisible')
                         || field.get("readonly")
                         || field.field.type === 'one2many'
@@ -795,20 +795,20 @@ instance.web.FormView = instance.web.View.extend({
                 switch(field.field.type) {
                 case 'selection':
                     displayed = _(field.values).find(function (option) {
-                            return option[0] === value;
+                            return option[0] === value_;
                         })[1];
                     break;
                 case 'many2one':
-                    displayed = field.value[1] || value;
+                    displayed = value_;
                     break;
                 default:
-                    displayed = value;
+                    displayed = value_;
                 }
 
                 return {
                     name: name,
                     string: field.node_atts.string,
-                    value: value,
+                    value: value_,
                     displayed: displayed,
                     // convert undefined to false
                     change_default: !!field.field.change_default
@@ -857,12 +857,15 @@ instance.web.FormView = instance.web.View.extend({
         this.fields[name] = field;
         this.fields_order.push(name);
         if (this.get_field(name).translate) {
-            translatable_fields.push(field);
+            this.translatable_fields.push(field);
         }
     },
     get_field: function(field_name) {
         return this.fields_view.fields[field_name];
     },
+    is_create_mode: function() {
+        return !this.datarecord.id;
+    },
 });
 
 /**
@@ -1262,7 +1265,7 @@ instance.web.form.compute_domain = function(expr, fields) {
                 _t("Unknown field %s in domain %s"),
                 ex[0], JSON.stringify(expr)));
         }
-        var field_value = field.get_value ? fields[ex[0]].get_value() : fields[ex[0]].value;
+        var field_value = field.get_value();
         var op = ex[1];
         var val = ex[2];
 
@@ -1563,6 +1566,10 @@ instance.web.form.FieldManagerInterface = {
      * Called by the field when the translate button is clicked.
      */
     open_translate_dialog: function(field) {},
+    /**
+     * Returns true when the view is in create mode.
+     */
+    is_create_mode: function() {},
 };
 
 /**
@@ -1599,7 +1606,7 @@ instance.web.form.FieldInterface = {
      * as well as any format commonly returned in a on_change. It must be able to autodetect those formats as
      * no information is ever given to know which format is used.
      */
-    set_value: function(value) {},
+    set_value: function(value_) {},
     /**
      * Get the current value of the widget.
      * 
@@ -1645,7 +1652,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this._super(field_manager, node);
         this.field_manager = field_manager;
         this.name = this.node.attrs.name;
-        this.value = false;
+        this.set({'value': false});
         this.field = this.field_manager.get_field(this.name);
         this.set({required: this.modifiers['required'] === true});
         this.invalid = this.dirty = false;
@@ -1677,8 +1684,8 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
             _.bind(set_required, this)();
         }
     },
-    set_value: function(value) {
-        this.value = value;
+    set_value: function(value_) {
+        this.set({'value': value_});
         this.invalid = false;
         this.update_dom();
         this.on_value_changed();
@@ -1692,7 +1699,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this.field_manager.open_translate_dialog(this);
     },
     get_value: function() {
-        return this.value;
+        return this.get('value');
     },
     is_valid: function() {
         return !this.invalid;
@@ -1703,7 +1710,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     update_dom: function(show_invalid) {
         this._super.apply(this, arguments);
         if (this.field.translate) {
-            this.$element.find('.oe_field_translate').toggle(!!this.view.datarecord.id);
+            this.$element.find('.oe_field_translate').toggle(!this.field_manager.is_create_mode());
         }
         if (!this.disable_utility_classes) {
             if (show_invalid) {
@@ -1794,12 +1801,12 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
     initialize_content: function() {
         this.$element.find('input').change(this.on_ui_change);
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
         this.render_value();
     },
     render_value: function() {
-        var show_value = instance.web.format_value(this.value, this, '');
+        var show_value = instance.web.format_value(this.get('value'), this, '');
         if (!this.get("effective_readonly")) {
             this.$element.find('input').val(show_value);
         } else {
@@ -1810,15 +1817,15 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
         }
     },
     set_value_from_ui: function() {
-        this.value = instance.web.parse_value(this.$element.find('input').val(), this);
+        this.set('value', instance.web.parse_value(this.$element.find('input').val(), this));
         this._super();
     },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
             try {
-                var value = instance.web.parse_value(this.$element.find('input').val(), this, '');
-                this.invalid = this.get("required") && value === '';
+                var value_ = instance.web.parse_value(this.$element.find('input').val(), this, '');
+                this.invalid = this.get("required") && value_ === '';
             } catch(e) {
                 this.invalid = true;
             }
@@ -1844,15 +1851,15 @@ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({
             this._super();
         } else {
             this.$element.find('a')
-                    .attr('href', 'mailto:' + this.value)
-                    .text(this.value);
+                    .attr('href', 'mailto:' + this.get('value'))
+                    .text(this.get('value'));
         }
     },
     on_button_clicked: function() {
-        if (!this.value || !this.is_valid()) {
+        if (!this.get('value') || !this.is_valid()) {
             this.do_warn("E-mail error", "Can't send email to invalid e-mail address");
         } else {
-            location.href = 'mailto:' + this.value;
+            location.href = 'mailto:' + this.get('value');
         }
     }
 });
@@ -1867,19 +1874,19 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
         if (!this.get("effective_readonly")) {
             this._super();
         } else {
-            var tmp = this.value;
+            var tmp = this.get('value');
             var s = /(\w+):(.+)/.exec(tmp);
             if (!s) {
-                tmp = "http://" + this.value;
+                tmp = "http://" + this.get('value');
             }
             this.$element.find('a').attr('href', tmp).text(tmp);
         }
     },
     on_button_clicked: function() {
-        if (!this.value) {
+        if (!this.get('value')) {
             this.do_warn("Resource error", "This resource is empty");
         } else {
-            var url = $.trim(this.value);
+            var url = $.trim(this.get('value'));
             if(/^www\./i.test(url))
                 url = 'http://'+url;
             window.open(url);
@@ -1891,19 +1898,19 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
     is_field_number: true,
     init: function (view, node) {
         this._super(view, node);
-        this.value = 0;
+        this.set({'value': 0});
         if (this.node.attrs.digits) {
             this.digits = py.eval(node.attrs.digits);
         } else {
             this.digits = this.field.digits;
         }
     },
-    set_value: function(value) {
-        if (value === false || value === undefined) {
+    set_value: function(value_) {
+        if (value_ === false || value_ === undefined) {
             // As in GTK client, floats default to 0
-            value = 0;
+            value_ = 0;
         }
-        this._super.apply(this, [value]);
+        this._super.apply(this, [value_]);
     }
 });
 
@@ -1929,14 +1936,14 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
         });
         this.$element.find('img.oe_datepicker_trigger').click(function() {
             if (!self.get("effective_readonly") && !self.picker('widget').is(':visible')) {
-                self.picker('setDate', self.value ? instance.web.auto_str_to_date(self.value) : new Date());
+                self.picker('setDate', self.get('value') ? instance.web.auto_str_to_date(self.get('value')) : new Date());
                 self.$input_picker.show();
                 self.picker('show');
                 self.$input_picker.hide();
             }
         });
         this.set_readonly(false);
-        this.value = false;
+        this.set({'value': false});
     },
     picker: function() {
         return $.fn[this.jqueryui_object].apply(this.$input_picker, arguments);
@@ -1945,16 +1952,16 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
         var date = this.picker('getDate');
         this.$input.val(date ? this.format_client(date) : '').change();
     },
-    set_value: function(value) {
-        this.value = value;
-        this.$input.val(value ? this.format_client(value) : '');
+    set_value: function(value_) {
+        this.set({'value': value_});
+        this.$input.val(value_ ? this.format_client(value_) : '');
     },
     get_value: function() {
-        return this.value;
+        return this.get('value');
     },
     set_value_from_ui: function() {
-        var value = this.$input.val() || false;
-        this.value = this.parse_client(value);
+        var value_ = this.$input.val() || false;
+        this.set({'value': this.parse_client(value_)});
     },
     set_readonly: function(readonly) {
         this.readonly = readonly;
@@ -1962,12 +1969,12 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
         this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', readonly);
     },
     is_valid: function() {
-        var value = this.$input.val();
-        if (value === "") {
+        var value_ = this.$input.val();
+        if (value_ === "") {
             return true;
         } else {
             try {
-                this.parse_client(value);
+                this.parse_client(value_);
                 return true;
             } catch(e) {
                 return false;
@@ -2010,22 +2017,22 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
             this.datewidget.appendTo(this.$element);
         }
     },
-    set_value: function(value) {
-        this._super(value);
+    set_value: function(value_) {
+        this._super(value_);
         this.render_value();
     },
     render_value: function() {
         if (!this.get("effective_readonly")) {
-            this.datewidget.set_value(this.value);
+            this.datewidget.set_value(this.get('value'));
         } else {
-            this.$element.text(instance.web.format_value(this.value, this, ''));
+            this.$element.text(instance.web.format_value(this.get('value'), this, ''));
         }
     },
     get_value: function() {
         if (!this.get("effective_readonly")) {
             return this.datewidget.get_value();
         } else {
-            return this.value;
+            return this.get('value');
         }
     },
     validate: function() {
@@ -2054,12 +2061,12 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
             this.resized = false;
         }
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
         this.render_value();
     },
     render_value: function() {
-        var show_value = instance.web.format_value(this.value, this, '');
+        var show_value = instance.web.format_value(this.get('value'), this, '');
         if (!this.get("effective_readonly")) {
             this.$textarea.val(show_value);
             if (!this.resized && this.view.options.resize_textareas) {
@@ -2071,15 +2078,15 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
         }
     },
     set_value_from_ui: function() {
-        this.value = instance.web.parse_value(this.$textarea.val(), this);
+        this.set({'value': instance.web.parse_value(this.$textarea.val(), this)});
         this._super();
     },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
             try {
-                var value = instance.web.parse_value(this.$textarea.val(), this, '');
-                this.invalid = this.get("required") && value === '';
+                var value_ = instance.web.parse_value(this.$textarea.val(), this, '');
+                this.invalid = this.get("required") && value_ === '';
             } catch(e) {
                 this.invalid = true;
             }
@@ -2125,12 +2132,12 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
         this.on("change:effective_readonly", this, check_readonly);
         _.bind(check_readonly, this)();
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
-        this.$checkbox[0].checked = value;
+        this.$checkbox[0].checked = value_;
     },
     set_value_from_ui: function() {
-        this.value = this.$checkbox.is(':checked');
+        this.set({value: this.$checkbox.is(':checked')});
         this._super.apply(this, arguments);
     },
     focus: function($element) {
@@ -2143,13 +2150,13 @@ instance.web.form.FieldProgressBar = instance.web.form.AbstractField.extend({
     start: function() {
         this._super.apply(this, arguments);
         this.$element.progressbar({
-            value: this.value,
+            value: this.get('value'),
             disabled: this.get("effective_readonly")
         });
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
-        var show_value = Number(value);
+        var show_value = Number(value_);
         if (isNaN(show_value)) {
             show_value = 0;
         }
@@ -2198,28 +2205,28 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
                 ischanging = false;
             });
     },
-    set_value: function(value) {
-        value = value === null ? false : value;
-        value = value instanceof Array ? value[0] : value;
-        this._super(value);
+    set_value: function(value_) {
+        value_ = value_ === null ? false : value_;
+        value_ = value_ instanceof Array ? value_[0] : value_;
+        this._super(value_);
         this.render_value();
     },
     render_value: function() {
         if (!this.get("effective_readonly")) {
             var index = 0;
             for (var i = 0, ii = this.values.length; i < ii; i++) {
-                if (this.values[i][0] === this.value) index = i;
+                if (this.values[i][0] === this.get('value')) index = i;
             }
             this.$element.find('select')[0].selectedIndex = index;
         } else {
             var self = this;
             var option = _(this.values)
-                .detect(function (record) { return record[0] === self.value; }); 
+                .detect(function (record) { return record[0] === self.get('value'); }); 
             this.$element.text(option ? option[1] : this.values[0][1]);
         }
     },
     set_value_from_ui: function() {
-        this.value = this.values[this.$element.find('select')[0].selectedIndex][0];
+        this.set({'value': this.values[this.$element.find('select')[0].selectedIndex][0]});
         this._super();
     },
     validate: function() {
@@ -2227,8 +2234,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
             this.invalid = false;
             return;
         }
-        var value = this.values[this.$element.find('select')[0].selectedIndex];
-        this.invalid = !(value && !(this.get("required") && value[0] === false));
+        var value_ = this.values[this.$element.find('select')[0].selectedIndex];
+        this.invalid = !(value_ && !(this.get("required") && value_[0] === false));
     },
     focus: function($element) {
         this._super($element || this.$element.find('select:first'));
@@ -2242,8 +2249,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
 
     function filter( array, term ) {
         var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
-        return $.grep( array, function(value) {
-            return matcher.test( $( "<div>" ).html( value.label || value.value || value ).text() );
+        return $.grep( array, function(value_) {
+            return matcher.test( $( "<div>" ).html( value_.label || value_.value || value_ ).text() );
         });
     }
 
@@ -2282,7 +2289,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
     init: function(view, node) {
         this._super(view, node);
         this.limit = 7;
-        this.set({value: false});
+        this.set({'value': false});
         this.display_value = {};
         this.last_search = [];
         this.floating = false;
@@ -2563,21 +2570,17 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
                  });
         }
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         var self = this;
-        if (value instanceof Array) {
+        if (value_ instanceof Array) {
             this.display_value = {};
-            this.display_value["" + value[0]] = value[1];
-            value = value[0];
+            this.display_value["" + value_[0]] = value_[1];
+            value_ = value_[0];
         }
-        value = value || false;
+        value_ = value_ || false;
         this.inhibit_on_change = true;
-        this.set({value: value});
+        this._super(value_);
         this.inhibit_on_change = false;
-        this._super(value);
-    },
-    get_value: function() {
-        return this.get("value");
     },
     validate: function() {
         this.invalid = this.get("required") && ! this.get("value");
@@ -2777,13 +2780,13 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             }
         }, undefined);
     },
-    set_value: function(value) {
-        value = value || [];
+    set_value: function(value_) {
+        value_ = value_ || [];
         var self = this;
         this.dataset.reset_ids([]);
-        if(value.length >= 1 && value[0] instanceof Array) {
+        if(value_.length >= 1 && value_[0] instanceof Array) {
             var ids = [];
-            _.each(value, function(command) {
+            _.each(value_, function(command) {
                 var obj = {values: command[2]};
                 switch (command[0]) {
                     case commands.CREATE:
@@ -2812,10 +2815,10 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             });
             this._super(ids);
             this.dataset.set_ids(ids);
-        } else if (value.length >= 1 && typeof(value[0]) === "object") {
+        } else if (value_.length >= 1 && typeof(value_[0]) === "object") {
             var ids = [];
             this.dataset.delete_all = true;
-            _.each(value, function(command) {
+            _.each(value_, function(command) {
                 var obj = {values: command};
                 obj['id'] = _.uniqueId(self.dataset.virtual_id_prefix);
                 obj.defaults = {};
@@ -2826,8 +2829,8 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             this._super(ids);
             this.dataset.set_ids(ids);
         } else {
-            this._super(value);
-            this.dataset.reset_ids(value);
+            this._super(value_);
+            this.dataset.reset_ids(value_);
         }
         if (this.dataset.index === null && this.dataset.ids.length > 0) {
             this.dataset.index = 0;
@@ -3064,13 +3067,13 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
             });
         })
     },
-    set_value: function(value) {
-        value = value || [];
-        if (value.length >= 1 && value[0] instanceof Array) {
-            value = value[0][2];
+    set_value: function(value_) {
+        value_ = value_ || [];
+        if (value_.length >= 1 && value_[0] instanceof Array) {
+            value_ = value_[0][2];
         }
-        this._super(value);
-        this.dataset.set_ids(value);
+        this._super(value_);
+        this.dataset.set_ids(value_);
         var self = this;
         self.reload_content();
         this.is_setted.resolve();
@@ -3219,10 +3222,10 @@ instance.web.form.SelectCreatePopup = instance.web.OldWidget.extend(/** @lends i
                 contexts: [this.context]
             }, function (results) {
                 var search_defaults = {};
-                _.each(results.context, function (value, key) {
+                _.each(results.context, function (value_, key) {
                     var match = /^search_default_(.*)$/.exec(key);
                     if (match) {
-                        search_defaults[match[1]] = value;
+                        search_defaults[match[1]] = value_;
                     }
                 });
                 self.setup_search_view(search_defaults);
@@ -3544,15 +3547,15 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
     is_dirty: function() {
         return this.selection.is_dirty() || this.m2o.is_dirty();
     },
-    set_value: function(value) {
-        this._super(value);
+    set_value: function(value_) {
+        this._super(value_);
         this.render_value();
     },
     render_value: function() {
         this.reference_ready = false;
         var vals = [], sel_val, m2o_val;
-        if (typeof(this.value) === 'string') {
-            vals = this.value.split(',');
+        if (typeof(this.get('value')) === 'string') {
+            vals = this.get('value').split(',');
         }
         sel_val = vals[0] || false;
         m2o_val = vals[1] ? parseInt(vals[1], 10) : false;
@@ -3638,8 +3641,8 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend(
         });
     },
     on_clear: function() {
-        if (this.value !== false) {
-            this.value = false;
+        if (this.get('value') !== false) {
+            this.set({'value': false});
             this.binary_value = false;
             this.on_ui_change();
         }
@@ -3654,14 +3657,14 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
         if (this.get("effective_readonly")) {
             var self = this;
             this.$element.find('a').click(function() {
-                if (self.value) {
+                if (self.get('value')) {
                     self.on_save_as();
                 }
                 return false;
             });
         }
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
         this.render_value();
     },
@@ -3671,28 +3674,28 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
             if (this.node.attrs.filename) {
                 show_value = this.view.datarecord[this.node.attrs.filename] || '';
             } else {
-                show_value = (this.value != null && this.value !== false) ? this.value : '';
+                show_value = (this.get('value') != null && this.get('value') !== false) ? this.get('value') : '';
             }
             this.$element.find('input').eq(0).val(show_value);
         } else {
-            this.$element.find('a').show(!!this.value);
-            if (this.value) {
+            this.$element.find('a').show(!!this.get('value'));
+            if (this.get('value')) {
                 var show_value = _t("Download") + " " + (this.view.datarecord[this.node.attrs.filename] || '');
                 this.$element.find('a').text(show_value);
             }
         }
     },
     on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {
-        this.value = file_base64;
+        this.set({'value': file_base64});
         this.binary_value = true;
         var show_value = name + " (" + this.human_filesize(size) + ")";
         this.$element.find('input').eq(0).val(show_value);
         this.set_filename(name);
     },
-    set_filename: function(value) {
+    set_filename: function(value_) {
         var filename = this.node.attrs.filename;
         if (this.view.fields[filename]) {
-            this.view.fields[filename].set_value(value);
+            this.view.fields[filename].set_value(value_);
             this.view.fields[filename].on_ui_change();
         }
     },
@@ -3713,15 +3716,15 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
         else
             this.$element.find('.oe-binary').hide();
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
         this.render_value();
     },
     render_value: function() {
         var url;
-        if (this.value && this.value.substr(0, 10).indexOf(' ') == -1) {
-            url = 'data:image/png;base64,' + this.value;
-        } else if (this.value) {
+        if (this.get('value') && this.get('value').substr(0, 10).indexOf(' ') == -1) {
+            url = 'data:image/png;base64,' + this.get('value');
+        } else if (this.get('value')) {
             url = '/web/binary/image?session_id=' + this.session.session_id + '&model=' +
                 this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime());
         } else {
@@ -3735,7 +3738,7 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
         this._super.apply(this, arguments);
     },
     on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {
-        this.value = file_base64;
+        this.set({'value': file_base64});
         this.binary_value = true;
         this.render_value();
     },
@@ -3753,9 +3756,9 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
 
         this.render_list();
     },
-    set_value: function(value) {
-        this._super(value);
-        this.selected_value = value;
+    set_value: function(value_) {
+        this._super(value_);
+        this.selected_value = value_;
 
         this.render_list();
     },

From a8113986cb0f6b33d48a1f2d32c3b03f020adcec Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 17:45:05 +0200
Subject: [PATCH 85/90] [imp] refactoring in form view: get rid of on_ui_change

bzr revid: nicolas.vanhoren@openerp.com-20120417154505-jhy2xhgx9s6qqd5z
---
 addons/web/static/src/js/view_form.js | 107 +++++++++++---------------
 1 file changed, 46 insertions(+), 61 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e79276458b3..3f9ef8301fd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1666,9 +1666,16 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this.on("change:readonly", this, test_effective_readonly);
         this.on("change:force_readonly", this, test_effective_readonly);
         _.bind(test_effective_readonly, this)();
+        
+        this.on("change:value", this, function() {
+            if (this._field_is_started && ! this._inhibit_on_change)
+                this._on_ui_change();
+        });
     },
     start: function() {
         this._super.apply(this, arguments);
+        // quick hack, will change later
+        this._field_is_started = true;
         if (this.field.translate) {
             this.$element.addClass('oe_form_field_translatable');
             this.$element.find('.oe_field_translate').click(this.on_translate);
@@ -1685,15 +1692,11 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         }
     },
     set_value: function(value_) {
+        this._inhibit_on_change = true;
         this.set({'value': value_});
+        this._inhibit_on_change = false;
         this.invalid = false;
         this.update_dom();
-        this.on_value_changed();
-    },
-    set_value_from_ui: function() {
-        this.on_value_changed();
-    },
-    on_value_changed: function() {
     },
     on_translate: function() {
         this.field_manager.open_translate_dialog(this);
@@ -1718,11 +1721,10 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
             }
         }
     },
-    on_ui_change: function() {
+    _on_ui_change: function() {
         this.dirty = true;
         this.validate();
         if (this.is_valid()) {
-            this.set_value_from_ui();
             this.view.do_onchange(this);
             this.view.on_form_changed(true);
             this.view.do_notify_change();
@@ -1799,10 +1801,13 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
         this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
     },
     initialize_content: function() {
-        this.$element.find('input').change(this.on_ui_change);
+        var self = this;
+        this.$element.find('input').change(function() {
+            self.set({'value': instance.web.parse_value(self.$element.find('input').val(), self)});
+        });
     },
     set_value: function(value_) {
-        this._super.apply(this, arguments);
+        this._super(value_);
         this.render_value();
     },
     render_value: function() {
@@ -1816,10 +1821,6 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
             this.$element.text(show_value);
         }
     },
-    set_value_from_ui: function() {
-        this.set('value', instance.web.parse_value(this.$element.find('input').val(), this));
-        this._super();
-    },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
@@ -1959,7 +1960,7 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
     get_value: function() {
         return this.get('value');
     },
-    set_value_from_ui: function() {
+    set_value_from_ui_: function() {
         var value_ = this.$input.val() || false;
         this.set({'value': this.parse_client(value_)});
     },
@@ -1989,7 +1990,7 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
     },
     on_change: function() {
         if (this.is_valid()) {
-            this.set_value_from_ui();
+            this.set_value_from_ui_();
         }
     }
 });
@@ -2013,7 +2014,9 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
     initialize_content: function() {
         if (!this.get("effective_readonly")) {
             this.datewidget = this.build_widget();
-            this.datewidget.on_change.add_last(this.on_ui_change);
+            this.datewidget.on_change.add_last(_.bind(function() {
+                this.set({'value': this.datewidget.get_value()});
+            }, this));
             this.datewidget.appendTo(this.$element);
         }
     },
@@ -2028,13 +2031,6 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
             this.$element.text(instance.web.format_value(this.get('value'), this, ''));
         }
     },
-    get_value: function() {
-        if (!this.get("effective_readonly")) {
-            return this.datewidget.get_value();
-        } else {
-            return this.get('value');
-        }
-    },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
@@ -2057,7 +2053,10 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
     initialize_content: function() {
         this.$textarea = undefined;
         if (!this.get("effective_readonly")) {
-            this.$textarea = this.$element.find('textarea').change(this.on_ui_change);
+            this.$textarea = this.$element.find('textarea');
+            this.$textarea.change(_.bind(function() {
+                this.set({'value': instance.web.parse_value(this.$textarea.val(), this)});
+            }, this));
             this.resized = false;
         }
     },
@@ -2077,10 +2076,6 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
             this.$element.text(show_value);
         }
     },
-    set_value_from_ui: function() {
-        this.set({'value': instance.web.parse_value(this.$textarea.val(), this)});
-        this._super();
-    },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
@@ -2125,7 +2120,9 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
     start: function() {
         this._super.apply(this, arguments);
         this.$checkbox = $("input", this.$element);
-        this.$element.click(this.on_ui_change);
+        this.$element.click(_.bind(function() {
+            this.set({'value': this.$checkbox.is(':checked')});
+        }, this));
         var check_readonly = function() {
             this.$checkbox.prop('disabled', this.get("effective_readonly"));
         };
@@ -2136,10 +2133,6 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
         this._super.apply(this, arguments);
         this.$checkbox[0].checked = value_;
     },
-    set_value_from_ui: function() {
-        this.set({value: this.$checkbox.is(':checked')});
-        this._super.apply(this, arguments);
-    },
     focus: function($element) {
         this._super($element || this.$checkbox);
     }
@@ -2196,7 +2189,9 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
         //   row
         var ischanging = false;
         this.$element.find('select')
-            .change(this.on_ui_change)
+            .change(_.bind(function() {
+                this.set({'value': this.values[this.$element.find('select')[0].selectedIndex][0]});
+            }, this))
             .change(function () { ischanging = true; })
             .click(function () { ischanging = false; })
             .keyup(function (e) {
@@ -2225,10 +2220,6 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
             this.$element.text(option ? option[1] : this.values[0][1]);
         }
     },
-    set_value_from_ui: function() {
-        this.set({'value': this.values[this.$element.find('select')[0].selectedIndex][0]});
-        this._super();
-    },
     validate: function() {
         if (this.get("effective_readonly")) {
             this.invalid = false;
@@ -2301,9 +2292,6 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
         this.on("change:value", this, function() {
             this.floating = false;
             this.render_value();
-            if (! this.inhibit_on_change) {
-                this.on_ui_change();
-            }
         });
     },
     initialize_content: function() {
@@ -2678,7 +2666,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
     trigger_on_change: function() {
         var tmp = this.doing_on_change;
         this.doing_on_change = true;
-        this.on_ui_change();
+        this._on_ui_change();
         this.doing_on_change = tmp;
     },
     load_views: function() {
@@ -3050,7 +3038,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
         this.dataset = new instance.web.form.Many2ManyDataSet(this, this.field.relation);
         this.dataset.m2m = this;
         this.dataset.on_unlink.add_last(function(ids) {
-            self.on_ui_change();
+            self.dataset_changed();
         });
         
         this.is_setted.then(function() {
@@ -3078,9 +3066,6 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
         self.reload_content();
         this.is_setted.resolve();
     },
-    get_value: function() {
-        return [commands.replace_with(this.dataset.ids)];
-    },
     validate: function() {
         this.invalid = false;
     },
@@ -3113,6 +3098,9 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
             return self.list_view.reload_content();
         });
     },
+    dataset_changed: function() {
+        this.set({'value': [commands.replace_with(this.dataset.ids)]});
+    },
 });
 
 instance.web.form.Many2ManyDataSet = instance.web.DataSetStatic.extend({
@@ -3142,7 +3130,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
             _.each(element_ids, function(one_id) {
                 if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
                     self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
-                    self.m2m_field.on_ui_change();
+                    self.m2m_field.dataset_changed();
                     self.reload_content();
                 }
             });
@@ -3506,7 +3494,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
         if (this.reference_ready) {
             var sel = this.selection.get_value();
             this.m2o.field.relation = sel;
-            this.m2o.set_value(null);
+            this.m2o.set_value(false);
             this.m2o.$element.toggle(sel !== false);
         }
     },
@@ -3526,7 +3514,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
             widget: 'selection'
         }});
         this.selection.set({readonly: this.get('effective_readonly')});
-        this.selection.on_value_changed.add_last(this.on_selection_changed);
+        this.selection.on("change:value", this, this.on_selection_changed);
         this.selection.$element = $(".oe_form_view_reference_selection", this.$element);
         this.selection.renderElement();
         this.selection.start();
@@ -3536,7 +3524,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
             widget: 'many2one'
         }});
         this.m2o.set({"readonly": this.get("effective_readonly")});
-        this.m2o.on_ui_change.add_last(this.on_ui_change);
+        this.m2o.on("change:value", this, this.data_changed);
         this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element);
         this.m2o.renderElement();
         this.m2o.start();
@@ -3567,15 +3555,15 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
         this.m2o.$element.toggle(sel_val !== false);
         this.reference_ready = true;
     },
-    get_value: function() {
+    data_changed: function() {
         var model = this.selection.get_value(),
             id = this.m2o.get_value();
         if (typeof(model) === 'string' && typeof(id) === 'number') {
-            return model + ',' + id;
+            this.set({'value': model + ',' + id});
         } else {
-            return false;
+            this.set({'value': false});
         }
-    }
+    },
 }));
 
 instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
@@ -3618,7 +3606,6 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend(
             console.warn("Error while uploading file : ", name);
         } else {
             this.on_file_uploaded_and_valid.apply(this, arguments);
-            this.on_ui_change();
         }
         this.$element.find('.oe-binary-progress').hide();
         this.$element.find('.oe-binary').show();
@@ -3642,9 +3629,8 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend(
     },
     on_clear: function() {
         if (this.get('value') !== false) {
-            this.set({'value': false});
             this.binary_value = false;
-            this.on_ui_change();
+            this.set({'value': false});
         }
         return false;
     }
@@ -3686,8 +3672,8 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
         }
     },
     on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {
-        this.set({'value': file_base64});
         this.binary_value = true;
+        this.set({'value': file_base64});
         var show_value = name + " (" + this.human_filesize(size) + ")";
         this.$element.find('input').eq(0).val(show_value);
         this.set_filename(name);
@@ -3695,8 +3681,7 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
     set_filename: function(value_) {
         var filename = this.node.attrs.filename;
         if (this.view.fields[filename]) {
-            this.view.fields[filename].set_value(value_);
-            this.view.fields[filename].on_ui_change();
+            this.view.fields[filename].set({value: value_});
         }
     },
     on_clear: function() {

From 8b531f7d178763fb90424a7fffa905319e76d4f2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 19:11:36 +0200
Subject: [PATCH 86/90] [FIX] inherited views

bzr revid: al@openerp.com-20120417171136-qm2t8tpr3pqe7g3a
---
 .../project_mailgate_view.xml                 | 42 +++++++++----------
 addons/project_mrp/project_mrp_view.xml       | 14 +++----
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/addons/project_mailgate/project_mailgate_view.xml b/addons/project_mailgate/project_mailgate_view.xml
index 6bf9855f98a..ea9855e9ec1 100644
--- a/addons/project_mailgate/project_mailgate_view.xml
+++ b/addons/project_mailgate/project_mailgate_view.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-	<openerp>
-		<data>
-			<record id="view_task_mailgate_form" model="ir.ui.view">
-		            <field name="name">task.mailgate.form</field>
-		            <field name="model">project.task</field>
-		            <field name="type">form</field>
-		            <field name="inherit_id" ref="project.view_task_form2"/>
-		            <field name="arch" type="xml">
-		                <xpath expr="/form/notebook/page[@string='Extra Info']" position="before">
-		                    <page string="History">
-	                        	<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
-			                        <tree string="History">
-			                            <field name="display_text" string="History Information"/>
-			                        </tree>
-	                    		</field>
-	                        </page>
-		                </xpath>
-		            </field>
-		       </record>
-	 	</data>
-</openerp> 
\ No newline at end of file
+<openerp>
+    <data>
+        <record id="view_task_mailgate_form" model="ir.ui.view">
+            <field name="name">task.mailgate.form</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook/page[@string='Extra Info']" position="before">
+                    <page string="History">
+                        <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
+                            <tree string="History">
+                                <field name="display_text" string="History Information"/>
+                            </tree>
+                        </field>
+                    </page>
+                </xpath>
+            </field>
+       </record>
+    </data>
+</openerp>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index b5ce4e8190d..32d2113727b 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -12,8 +12,7 @@
                 </field>
             </field>
         </record>
-        
-  	<record id="view_product_task_form" model="ir.ui.view">
+        <record id="view_product_task_form" model="ir.ui.view">
             <field name="name">product.form.view.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
@@ -24,18 +23,17 @@
                 </field>
             </field>
         </record>
-        
-    <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
+        <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
             <field name="name">project.mrp.form.view.inherit</field>
             <field name="model">project.task</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-            <xpath expr="/form/notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
+            <xpath expr="//notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
                 <field name="sale_line_id"/>
-            </xpath>    
+            </xpath>
             </field>
-        </record>  
+        </record>
     </data>
 </openerp>
-        
+

From 7617b65d6cbfe8f38b91289875bdb99bb4367131 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 19:35:28 +0200
Subject: [PATCH 87/90] [FIX] inherited views part2

bzr revid: al@openerp.com-20120417173528-s9t4pl0c2z2aqyfy
---
 addons/project_scrum/project_scrum_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 7fb84f12213..fe1301eb4c3 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -545,9 +545,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group/field[@name='progress']" position="after">
+                <field name="progress" position="after">
                     <field domain="[('project_id','=',project_id),]" name="product_backlog_id" select="1"/>
-                </xpath>
+                </field>
             </field>
         </record>
 
@@ -557,9 +557,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Extra Info']/group/field[@name='sequence']" position="after">
+                <field name="sequence" position="after">
                     <field name="sprint_id" domain="[('state', 'in', ['draft', 'open'])]" readonly="1"/>
-                </xpath>
+                </field>
             </field>
         </record>
 

From dbd05896bfab0f773f0a93f3e5da41f7f73bd420 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 18 Apr 2012 04:41:29 +0000
Subject: [PATCH 88/90] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120418044129-45ghxqbko60k5i4q
---
 openerp/addons/base/i18n/ja.po | 126 +++++++++++++++++++++++----------
 1 file changed, 89 insertions(+), 37 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 8f6da375214..b2433098807 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-04-16 18:23+0000\n"
+"PO-Revision-Date: 2012-04-18 02:23+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -193,7 +193,7 @@ msgstr "販売分析の配布"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_process
 msgid "Process"
-msgstr ""
+msgstr "プロセス"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
@@ -492,7 +492,7 @@ msgstr "PADの仕様"
 msgid ""
 "The user this filter is available to. When left empty the filter is usable "
 "by the system only."
-msgstr ""
+msgstr "このフィルタを使用可能であるユーザ。フィルタを空のままにすると、システムのみが使用します。"
 
 #. module: base
 #: help:res.partner,website:0
@@ -632,6 +632,22 @@ msgid ""
 "    Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent\n"
 "\n"
 msgstr ""
+"\n"
+"未払いの請求書のために多レベルで思い起こさせるための手紙の自動化モジュールです。\n"
+"==========================================================================\n"
+"\n"
+"メニューから思い出させるための多くのレベルが定義できます：\n"
+"　　会計 / 設定 / その他 / フォローアップ\n"
+"\n"
+"定義を終えたら、メニューから単純にクリックするだけで毎日自動的に印刷ができます：\n"
+"　　会計 / 定期処理 / 請求書 / フォローアップの送信\n"
+"\n"
+"定義された異なったレベルで思い出させる方法に従って全ての手紙をPDFで作成します。\n"
+"異なる会社のために異なるポリシーを定義でき、顧客にメールすることもできます。\n"
+"\n"
+"所定のパートナ / アカウントエントリーのためにフォローアップレベルをチェックしたい場合は、このメニューを使うことができます：\n"
+"　　会計 / レポート / 一般的なレポート / パートナ / フォローアップ送信済み\n"
+"\n"
 
 #. module: base
 #: field:res.country,name:0
@@ -661,7 +677,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pw
 msgid "Palau"
-msgstr ""
+msgstr "パラオ"
 
 #. module: base
 #: view:res.partner:0
@@ -689,7 +705,7 @@ msgstr "ウィザード"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
 msgid "Miscellaneous Suppliers"
-msgstr ""
+msgstr "その他仕入先"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:287
@@ -763,7 +779,7 @@ msgstr "エリトリア"
 #. module: base
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "会社名は固有でなければなりません。"
+msgstr "会社名は固有でなければいけません。"
 
 #. module: base
 #: view:res.config:0
@@ -859,7 +875,7 @@ msgstr "言語のインポート"
 #. module: base
 #: help:ir.cron,interval_number:0
 msgid "Repeat every x."
-msgstr ""
+msgstr "全ての x で繰り返す"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -928,7 +944,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr ""
+msgstr "基本的なパートナ"
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -1297,7 +1313,7 @@ msgstr "アクションURL"
 #. module: base
 #: field:base.module.import,module_name:0
 msgid "Module Name"
-msgstr ""
+msgstr "モジュール名"
 
 #. module: base
 #: model:res.country,name:base.mh
@@ -1384,6 +1400,8 @@ msgid ""
 "use the accounting application of OpenERP, journals and accounts will be "
 "created automatically based on these data."
 msgstr ""
+"あなたの会社の銀行口座を設定し、レポートのフッターに現れるべきそれを選択して下さい。リストビューから銀行口座の並べ替えができます。OpenERPの会計アプ"
+"リケーションを使う場合は、仕訳帳とアカウントはそれらのデータを元に自動的に作成されます。"
 
 #. module: base
 #: view:ir.module.module:0
@@ -1604,7 +1622,7 @@ msgstr "ログイン"
 #: model:ir.actions.act_window,name:base.action_wizard_update_translations
 #: model:ir.ui.menu,name:base.menu_wizard_update_translations
 msgid "Synchronize Terms"
-msgstr ""
+msgstr "用語の同期"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2224,7 +2242,7 @@ msgstr "表示モード"
 msgid ""
 "Display this bank account on the footer of printed documents like invoices "
 "and sales orders."
-msgstr ""
+msgstr "請求書や受注オーダーのような印刷されるドキュメントのフッターに現れる銀行口座を示して下さい。"
 
 #. module: base
 #: view:base.language.import:0
@@ -2457,7 +2475,7 @@ msgstr "ベリーズ"
 #. module: base
 #: help:ir.actions.report.xml,header:0
 msgid "Add or not the corporate RML header"
-msgstr ""
+msgstr "会社のRMLヘッダーを追加するか否か"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_recruitment
@@ -2560,6 +2578,14 @@ msgid ""
 "and categorize your interventions with a channel and a priority level.\n"
 "    "
 msgstr ""
+"\n"
+"Helpdesk\n"
+"====================\n"
+"\n"
+"ライクレコード、クレーム処理、ヘルプデスク、サポートは仲裁の追跡のために良いツールです。\n"
+"このメニューは口頭コミュニケーションよりも適しており、必ずしもクレームとは関係がありません。\n"
+"顧客を選択し、注記を加えそしてチャンネルと優先度レベルとともに仲裁を分類して下さい。\n"
+"    "
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2650,7 +2676,7 @@ msgstr "オブジェクト名は x_ で始める必要があり、特殊文字
 #. module: base
 #: field:ir.actions.configuration.wizard,note:0
 msgid "Next Wizard"
-msgstr ""
+msgstr "次のウィザード"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
@@ -2830,7 +2856,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr ""
+msgstr "トリニダード・トバゴ"
 
 #. module: base
 #: model:res.country,name:base.lv
@@ -2900,7 +2926,7 @@ msgstr "継承"
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
 msgid "Serialization Field"
-msgstr ""
+msgstr "シリアライズ項目"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_report_designer
@@ -2918,7 +2944,7 @@ msgstr "%y - ２桁の年[00,99]."
 #: code:addons/base/res/res_company.py:155
 #, python-format
 msgid "Fax: "
-msgstr ""
+msgstr "FAX： "
 
 #. module: base
 #: model:res.country,name:base.si
@@ -3245,7 +3271,7 @@ msgstr "オーストリア"
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Install"
-msgstr ""
+msgstr "インストールのキャンセル"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_invoice_bba
@@ -3339,7 +3365,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
 msgid "Module dependency"
-msgstr ""
+msgstr "モジュール依存度"
 
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
@@ -6271,7 +6297,7 @@ msgstr ""
 #. module: base
 #: help:res.country.state,code:0
 msgid "The state code in three chars.\n"
-msgstr ""
+msgstr "３文字の状態コード\n"
 
 #. module: base
 #: model:res.country,name:base.sj
@@ -6294,7 +6320,7 @@ msgstr "基本かんばん"
 #: view:ir.actions.server:0
 #: view:res.request:0
 msgid "Group By"
-msgstr ""
+msgstr "グループ化"
 
 #. module: base
 #: view:res.config:0
@@ -6343,7 +6369,7 @@ msgstr "翻訳"
 #. module: base
 #: selection:res.request,state:0
 msgid "closed"
-msgstr ""
+msgstr "閉鎖済み"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cr
@@ -7136,7 +7162,7 @@ msgstr "モジュール"
 #: field:workflow.activity,subflow_id:0
 #: field:workflow.workitem,subflow_id:0
 msgid "Subflow"
-msgstr ""
+msgstr "サブフロー"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config
@@ -7428,7 +7454,7 @@ msgstr "保守契約"
 #: model:res.groups,name:base.group_user
 #: field:res.partner,employee:0
 msgid "Employee"
-msgstr ""
+msgstr "従業員"
 
 #. module: base
 #: field:ir.model.access,perm_create:0
@@ -7727,7 +7753,7 @@ msgstr "エクアドル - 会計"
 #. module: base
 #: field:res.partner.category,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "分類名"
 
 #. module: base
 #: view:res.widget:0
@@ -8865,7 +8891,7 @@ msgstr "親分類"
 #. module: base
 #: selection:ir.property,type:0
 msgid "Integer Big"
-msgstr ""
+msgstr "大きな整数"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -10761,7 +10787,7 @@ msgstr "会社"
 #. module: base
 #: help:res.currency,symbol:0
 msgid "Currency sign, to be used when printing amounts."
-msgstr ""
+msgstr "通貨記号：印刷時に使用される"
 
 #. module: base
 #: view:res.lang:0
@@ -11080,7 +11106,7 @@ msgstr "ガイアナ"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_expiry
 msgid "Products Expiry Date"
-msgstr ""
+msgstr "製品の有効期限"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account
@@ -11114,6 +11140,32 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"会計と財務管理\n"
+"====================================\n"
+"\n"
+"財務と会計モジュールは次をカバーします：\n"
+"--------------------------------------------\n"
+"一般的な会計\n"
+"コスト / 分析会計\n"
+"サードパーティ会計\n"
+"\n"
+"税金管理\n"
+"予算\n"
+"顧客と仕入先請求書\n"
+"銀行明細書\n"
+"パートナによる調整処理\n"
+"\n"
+"会計士のための次のものを含むダッシュボードを作成して下さい：\n"
+"--------------------------------------------------\n"
+"・承認すべき顧客請求書のリスト\n"
+"・ 会社分析\n"
+"・ 売掛金年齢表\n"
+"・ 金庫のグラフ\n"
+"\n"
+"総勘定元帳を維持するような処理が、特定の会計年度のため、そしてaccount_voucherというモジュールによる証書の準備のための定義された財務仕訳帳（"
+"エントリー移動行または仕訳帳を通して維持されたグループ化）を通して実行されます。\n"
+"    "
 
 #. module: base
 #: help:ir.actions.act_window,view_type:0
@@ -11350,7 +11402,7 @@ msgstr ""
 #: field:res.partner,comment:0
 #: model:res.widget,title:base.note_widget
 msgid "Notes"
-msgstr "注釈"
+msgstr "注記"
 
 #. module: base
 #: field:ir.config_parameter,value:0
@@ -11413,7 +11465,7 @@ msgstr "もし指定した場合は、このアクションは標準メニュー
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_map
 msgid "Google Maps on Customers"
-msgstr ""
+msgstr "顧客のGoogle Maps"
 
 #. module: base
 #: model:ir.actions.report.xml,name:base.preview_report
@@ -12752,7 +12804,7 @@ msgstr "アラビア語 / الْعَرَبيّة"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
-msgstr ""
+msgstr "こんにちは"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -13508,7 +13560,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_plans
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "多数の分析プラン"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_timesheet
@@ -13674,7 +13726,7 @@ msgstr "ユーザの参照"
 #: code:addons/base/res/res_users.py:118
 #, python-format
 msgid "Warning !"
-msgstr "警告!"
+msgstr "警告"
 
 #. module: base
 #: model:res.widget,title:base.google_maps_widget
@@ -13877,7 +13929,7 @@ msgstr "Trueにセットする場合、ウィザードはフォームビュー
 #. module: base
 #: view:base.language.import:0
 msgid "- type,name,res_id,src,value"
-msgstr ""
+msgstr "- タイプ、名前、リソースID、ソース、値"
 
 #. module: base
 #: model:res.country,name:base.hm
@@ -17085,7 +17137,7 @@ msgstr "クック諸島"
 #. module: base
 #: field:ir.model.data,noupdate:0
 msgid "Non Updatable"
-msgstr ""
+msgstr "更新可能でない"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17191,7 +17243,7 @@ msgstr "国"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_messages
 msgid "In-Project Messaging System"
-msgstr ""
+msgstr "プロジェクト内部のメッセージングシステム"
 
 #. module: base
 #: model:res.country,name:base.pn

From 79c1e97479535e794f3a298a625b6dd18f5544bd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 18 Apr 2012 04:57:43 +0000
Subject: [PATCH 89/90] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120418044206-a2vk0nr789l7d42j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120418045743-hzbql3f1knlrc5yh
---
 addons/account/i18n/ja.po                     |  181 +--
 .../i18n/gu.po                                |  374 ++++++
 .../i18n/ja.po                                |    6 +-
 addons/account_budget/i18n/sr@latin.po        |   10 +-
 addons/crm/i18n/ja.po                         |    4 +-
 addons/hr/i18n/ja.po                          |   24 +-
 addons/hr_holidays/i18n/ja.po                 |  844 ++++++++++++
 addons/hr_payroll/i18n/ja.po                  |   12 +-
 addons/hr_payroll_account/i18n/ja.po          |   10 +-
 addons/hr_recruitment/i18n/ja.po              |   14 +-
 addons/hr_timesheet/i18n/ja.po                |   20 +-
 addons/hr_timesheet_invoice/i18n/ja.po        | 1147 +++++++++++++++++
 addons/hr_timesheet_sheet/i18n/ja.po          | 1042 +++++++++++++++
 addons/html_view/i18n/ja.po                   |   49 +
 addons/import_sugarcrm/i18n/fr.po             |  404 ++++++
 addons/web_dashboard/i18n/sv.po               |  112 ++
 addons/web_diagram/i18n/sv.po                 |   57 +
 addons/web_graph/i18n/sv.po                   |   23 +
 addons/web_kanban/i18n/sv.po                  |   55 +
 addons/web_mobile/i18n/sv.po                  |  106 ++
 addons/web_process/i18n/bs.po                 |  118 ++
 addons/web_process/i18n/sv.po                 |  118 ++
 22 files changed, 4597 insertions(+), 133 deletions(-)
 create mode 100644 addons/account_bank_statement_extensions/i18n/gu.po
 create mode 100644 addons/hr_holidays/i18n/ja.po
 create mode 100644 addons/hr_timesheet_invoice/i18n/ja.po
 create mode 100644 addons/hr_timesheet_sheet/i18n/ja.po
 create mode 100644 addons/html_view/i18n/ja.po
 create mode 100644 addons/import_sugarcrm/i18n/fr.po
 create mode 100644 addons/web_dashboard/i18n/sv.po
 create mode 100644 addons/web_diagram/i18n/sv.po
 create mode 100644 addons/web_graph/i18n/sv.po
 create mode 100644 addons/web_kanban/i18n/sv.po
 create mode 100644 addons/web_mobile/i18n/sv.po
 create mode 100644 addons/web_process/i18n/bs.po
 create mode 100644 addons/web_process/i18n/sv.po

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 781f574222c..cdebfa4c93d 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-17 04:15+0000\n"
+"PO-Revision-Date: 2012-04-17 21:27+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -43,7 +43,7 @@ msgstr "会計 \\ レポート \\ 一般的なレポート \\ 税金 \\ 税金
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "仕訳帳入力の調整"
+msgstr "仕訳帳エントリーの照合"
 
 #. module: account
 #: view:account.account:0
@@ -109,7 +109,7 @@ msgstr "借方合計"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
-msgstr "取引を調整しない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
+msgstr "取引を照合しない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
 
 #. module: account
 #: constraint:account.journal:0
@@ -131,7 +131,7 @@ msgstr "起点"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "調整"
+msgstr "照合"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -146,7 +146,7 @@ msgstr "参照"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr "年度の選択 "
+msgstr "会計年度の選択 "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -218,7 +218,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "調整のため選択する行の移動"
+msgstr "照合選択行の移動"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -237,7 +237,7 @@ msgstr "請求書 %s は部分的に支払われます：%s%s / %s%s（%s%s 残
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "会計エントリーは調整の入力です。"
+msgstr "会計エントリーは照合の入力です。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -263,29 +263,29 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "小計："
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "手動の自動継続"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr ""
+msgstr "年度を閉じる"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr ""
+msgstr "帳消しの許可"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "分析期間の選択"
 
 #. module: account
 #: view:account.move.line:0
@@ -296,19 +296,19 @@ msgstr ""
 #: code:addons/account/account_invoice.py:551
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
-msgstr ""
+msgstr "請求書行のアカウントの会社が請求書の会社と一致しません。"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "項目名"
 
 #. module: account
 #: help:account.installer,charts:0
 msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
-msgstr ""
+msgstr "あなたの国に基づき、あなたの会社の会計ニーズに可能な限り近くマッチする、ローカル化会計表をインストールします。"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -319,17 +319,21 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
+"この会社のために %s タイプのどんな会計仕訳帳も見つけることができません。\n"
+"\n"
+"メニューからそれを作成することができます： \n"
+"設定 / 金融会計 / アカウント / 仕訳帳"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "照合なしアカウント"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "購入属性"
 
 #. module: account
 #: help:account.financial.report,style_overwrite:0
@@ -338,11 +342,13 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"このレコードを表示させるための好みのフォーマットをここで設定できます。自動フォーマッティングを残す場合は、それは財務レポートの階層（自動計算項目\"レベル"
+"\"）に基づき計算されます。"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "設定"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -351,7 +357,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "６月"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -360,11 +366,13 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"このビューはOpenERPの大量のエントリーを記録するために会計士によって利用されます。銀行明細書、キャッシュレジスター、または顧客 / "
+"仕入先支払いを利用する場合、仕訳帳項目はOpenERPによって作成されます。"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "ビュータイプのアカウントでは仕訳項目を作ることはできません。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -380,49 +388,49 @@ msgstr ""
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "作成日"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "購入の払い戻し"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "事態 開く / 閉じる"
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "明細入力に使用される通貨"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "会計年度を開く"
 
 #. module: account
 #: help:account.journal,sequence_id:0
 msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
-msgstr ""
+msgstr "この項目にはこの仕訳帳の仕訳エントリーのナンバリングに冠する情報が含まれています。"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "デフォルト借方アカウント"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "貸方合計"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr ""
+msgstr "照合なしのために開く"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -430,17 +438,17 @@ msgstr ""
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "チャートテンプレート"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "オプションの他の通貨で表現された金額"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "比較を可能化"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -449,6 +457,7 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"仕訳帳期間が作成される場合、その状態はドラフトです。レポートが印刷された場合は、印刷済み状態になります。全ての取引が終了すると完了状態となります。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -458,6 +467,8 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
+"税金のチャートは税金の事実（または税金コード）の構造を反映したツリービューで、現在の税金の状況を示します。税金チャートはあなたの国の税金申告の各領域の金額"
+"を表します。それはあなたのニーズに合わせて変更できる階層的な構造で表示されます。"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -487,22 +498,22 @@ msgstr ""
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "仕訳帳"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "選択した請求集書を確認"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "親ターゲット"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "この仕訳帳で使用されるアカウント"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -520,17 +531,17 @@ msgstr ""
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "勘定科目表の選択"
 
 #. module: account
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "会社名は固有でなければいけません。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "請求書払い戻し"
 
 #. module: account
 #: report:account.overdue:0
@@ -540,31 +551,31 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "照合なし取引"
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "相手方"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr ""
+msgstr "税金のマッピング"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr ""
+msgstr "会計年度を閉じる"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "会計士は明細書を確認します。"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -573,45 +584,45 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "全て"
 
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "請求書住所の名前"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "３ヶ月毎"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr ""
+msgstr "取引を照合しない場合、それらが無効にされないためにそれらの取引にリンクされる全てのアクションを検査しなければなりません。"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30日   "
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "順序"
 
 #. module: account
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "レポート値"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr ""
+msgstr "税金マッピング"
 
 #. module: account
 #: report:account.central.journal:0
@@ -621,18 +632,18 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "主となる順序は現在と異なる必要があります。"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "No period found or more than one period found for the given date."
-msgstr ""
+msgstr "所定の日付のために期間が見つからないか、複数の期間が見つかりました。"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "税金コード金額"
 
 #. module: account
 #: code:addons/account/account.py:3116
@@ -644,29 +655,29 @@ msgstr ""
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr ""
+msgstr "期間を閉じる"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "アカウント共有パートナレポート"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "開始エントリーの期間"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr ""
+msgstr "仕訳帳期間"
 
 #. module: account
 #: code:addons/account/account_move_line.py:750
 #: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr ""
+msgstr "エントリーを照合するために、会社は全てのエントリーに対して同じであるべきです。"
 
 #. module: account
 #: view:account.account:0
@@ -678,34 +689,34 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "売掛金アカウント"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
-msgstr ""
+msgstr "仕訳帳エントリーの日付が定義された期間ではありません。日付を変更するか仕訳帳からこの制約を削除する必要があります。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "総勘定元帳レポート"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "再度開く"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "本当にエントリーを作成しますか？"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "請求書印刷"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
@@ -792,7 +803,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr ""
+msgstr "仕入先請求書と払い戻し"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -857,7 +868,7 @@ msgstr ""
 msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
-msgstr ""
+msgstr "既に調整済みの %s は請求できません。請求書は未調整であるべきです。この請求書は払い戻しのみできます。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -872,7 +883,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr ""
+msgstr "キャンセル：請求書と調整の払い戻し"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -960,7 +971,7 @@ msgstr ""
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "販売払い戻し"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -1473,6 +1484,8 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"仕訳帳エントリーは幾つかの仕訳帳項目を含んでいます。それぞれは借方あるいは貸方取引の何れかです。OpenERPは会計ドキュメントごとにひとつの仕訳帳エント"
+"リーを自動的に作成します：請求書、払い戻し、仕入先支払い、銀行明細など"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1495,7 +1508,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr ""
+msgstr "仕入先払い戻し"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1574,7 +1587,7 @@ msgstr ""
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr ""
+msgstr "払い戻し税金アカウント"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1651,7 +1664,7 @@ msgstr ""
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
-msgstr ""
+msgstr "請求書のキャンセル：現在の請求書をキャンセルするために払い戻し請求書を作成し、検証し、調整して下さい。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -2607,7 +2620,7 @@ msgstr ""
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "ベースコードの払い戻し"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2819,7 +2832,7 @@ msgstr ""
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
-msgstr ""
+msgstr "開いているか支払済みの請求書は削除できません。その代わりに払い戻しをすることをお勧めします。"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -3643,7 +3656,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr ""
+msgstr "払い戻しのドラフトを作成"
 
 #. module: account
 #: view:account.state.open:0
@@ -4447,7 +4460,7 @@ msgstr ""
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr ""
+msgstr "税金コードの払い戻し"
 
 #. module: account
 #: view:validate.account.move:0
@@ -4544,7 +4557,7 @@ msgid ""
 "Bank Account Number to which the invoice will be paid. A Company bank "
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
-msgstr ""
+msgstr "請求書が支払われる先の銀行口座番号です。顧客請求書や仕入れ先払い戻しであれば会社の銀行口座、さもなくばパートナの銀行口座番号です。"
 
 #. module: account
 #: view:account.state.open:0
@@ -5177,7 +5190,7 @@ msgstr ""
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "顧客払い戻し"
 
 #. module: account
 #: constraint:account.move:0
@@ -5286,7 +5299,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "顧客請求書と払い戻し"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5342,7 +5355,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr ""
+msgstr "払い戻し請求書オプション"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5581,7 +5594,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "払い戻し請求書"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
diff --git a/addons/account_bank_statement_extensions/i18n/gu.po b/addons/account_bank_statement_extensions/i18n/gu.po
new file mode 100644
index 00000000000..3e77a3b8a26
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/gu.po
@@ -0,0 +1,374 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-17 09:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "બેન્ક વ્યવહારો શોધો"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "સમર્થિત"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "પેરેંટ કોડ"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "ઉધાર"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "ગ્રુપ દ્વારા..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "સ્થિતિ"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "કાચું"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "વિધાન"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "પ્રકાર"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "રોજનામું"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr ""
diff --git a/addons/account_bank_statement_extensions/i18n/ja.po b/addons/account_bank_statement_extensions/i18n/ja.po
index b852e95c682..f040102bb83 100644
--- a/addons/account_bank_statement_extensions/i18n/ja.po
+++ b/addons/account_bank_statement_extensions/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-17 04:52+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -186,7 +186,7 @@ msgstr "借方取引"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Extended Filters..."
-msgstr "拡張したフィルタ…"
+msgstr "拡張フィルタ…"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
diff --git a/addons/account_budget/i18n/sr@latin.po b/addons/account_budget/i18n/sr@latin.po
index 602ad560c1e..76b06435064 100644
--- a/addons/account_budget/i18n/sr@latin.po
+++ b/addons/account_budget/i18n/sr@latin.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-11-10 16:52+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
+"PO-Revision-Date: 2012-04-17 05:29+0000\n"
+"Last-Translator: Maroje Delibasic <maroje.delibasic@gmail.com>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:48+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -331,7 +331,7 @@ msgstr "Početak perioda"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr "Izvestaj rezimea budžeta za unakrsni konto"
+msgstr "Izveštaj rezimea budžeta za unakrsni konto"
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index e38caf8c8af..9039dcb8bec 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index 1486a75741d..1263a5c73b3 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-17 01:59+0000\n"
+"PO-Revision-Date: 2012-04-17 18:27+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -35,19 +35,19 @@ msgstr "エラー。反復する部署を作ることはできません。"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "従業員を情報に連携"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "社会保険番号"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_main
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "人材"
 
 #. module: hr
 #: view:hr.employee:0 view:hr.job:0
@@ -152,7 +152,7 @@ msgid ""
 "Your Company's Department Structure is used to manage all documents related "
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
-msgstr ""
+msgstr "部門組織構造は、従業員に関する全てのドキュメントの管理に使われます。例えば、経費、タイムシートの検証、休暇の管理、採用など。"
 
 #. module: hr
 #: field:hr.employee,color:0
@@ -189,7 +189,7 @@ msgstr "この職種に必要な従業員の数"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr "出欠"
+msgstr "勤怠"
 
 #. module: hr
 #: view:hr.employee:0
@@ -204,7 +204,7 @@ msgstr "勤務先電話"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "子関係の区分"
+msgstr "下位区分"
 
 #. module: hr
 #: view:hr.job:0 field:hr.job,description:0
@@ -347,7 +347,7 @@ msgstr "従業員を作成する。"
 #. module: hr
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr "分類"
+msgstr "カテゴリー"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_view_employee_list_my
@@ -411,7 +411,7 @@ msgstr "下位部門"
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr "ステータス"
+msgstr "状態"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -582,7 +582,7 @@ msgstr "国籍"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr "作業終了"
+msgstr "休暇"
 
 #. module: hr
 #: view:board.board:0
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
new file mode 100644
index 00000000000..b7f627c4a75
--- /dev/null
+++ b/addons/hr_holidays/i18n/ja.po
@@ -0,0 +1,844 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-04-18 04:38+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "青"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "割振りタイプ"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr "2番目の承認待ち"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr "休暇の最大値 - 既取得休暇"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "休暇管理"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Allocation Mode"
+msgstr "割振りモード"
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "部門"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
+msgid "Requests Approve"
+msgstr "承認を申請"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "拒否"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr "従業員のカテゴリー"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid " Month-1"
+msgstr " 月-1"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "茶"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr "残り日数"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "従業員ごと"
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
+msgstr "この休暇申請 / 割振りが全ての従業員のためであるならば、この項目を空白にしておくことができます。"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr "草稿に設定"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr "薄青緑色"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "薄緑"
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_id:0
+msgid "Current Leave Type"
+msgstr "現在の休暇タイプ"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leave requests can be recorded by employees and validated by their managers. "
+"Once a leave request is validated, it appears automatically in the agenda of "
+"the employee. You can define several allowance types (paid holidays, "
+"sickness, etc.) and manage allowances per type."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr "休暇の要約"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr "承認済み"
+
+#. module: hr_holidays
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr "最新の接続"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr "拒否"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr "この従業員 %s の休暇を承認できません：残りの休暇日数が足りません (%s)"
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"The state is set to 'Draft', when a holiday request is created.            \n"
+"The state is 'Waiting Approval', when holiday request is confirmed by user.  "
+"          \n"
+"The state is 'Refused', when holiday request is refused by manager.          "
+"  \n"
+"The state is 'Approved', when holiday request is approved by manager."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
+msgid "Leaves"
+msgstr "休暇"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr "休暇"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
+msgid "Leave Requests to Approve"
+msgstr "休暇申請の承認"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr "部門ごとの休暇"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "キャンセルされました。"
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
+msgstr ""
+"休暇を希望している人がいたら、「休暇申請」を選んでください。　\n"
+"誰かの休暇を増やすのであれば、「割当て申請」を選んでください。"
+
+#. module: hr_holidays
+#: help:hr.employee,remaining_leaves:0
+msgid ""
+"Total number of legal leaves allocated to this employee, change this value "
+"to create allocation/leave requests."
+msgstr "この従業員の法定休暇の日数です。割当て/休暇申請を指定するには、この値を変更して下さい。"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr "承認"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr "報告書の色"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr "従業員ごとの休暇要約報告書"
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automatically filled by the user who validate the leave"
+msgstr "この項目は、休暇を承認されたユーザによって自動的に入力されます。"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.model,name:hr_holidays.model_hr_holidays_status
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr "休暇タイプ"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid "Warning!"
+msgstr "警告"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr "赤紫色"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr "少なくとも一つの部門を指定して、やり直して下さい。"
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Confirmed"
+msgstr "確認済み"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr "から"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:384
+#, python-format
+msgid "Leave Request for %s"
+msgstr "%s の休暇申請"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr "残りの休暇日数"
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr "タイプごとの休暇日数"
+
+#. module: hr_holidays
+#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+#: model:ir.model,name:hr_holidays.model_hr_employee
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr "赤色"
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr "タイプごとの休暇"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "薄桃色"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr "小麦色"
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr "エラー。休暇開始日は休暇終了日の前でなければいけません。"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:382
+#, python-format
+msgid "Allocation for %s"
+msgstr "%s の割当て"
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr "日数"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid ""
+"The feature behind the field 'Remaining Legal Leaves' can only be used when "
+"there is only one leave type with the option 'Allow to Override Limit' "
+"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
+"decide on which leave type the update has to be done. \n"
+"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
+"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
+"the employees if the configuration does not allow to use this field."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr "休暇タイプを検索"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr "従業員あるいはカテゴリーを選んで下さい。"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"If its True then its Allocation/Request have to be validated by second "
+"validator"
+msgstr "これが正しいならば、その割当て / 申請は第2の承認者によって承認されなければなりません。"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr "承認待ち"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr "従業員"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you set a meeting type, OpenERP will create a meeting in the calendar "
+"once a leave is validated."
+msgstr "ミーティングのタイプを設定すると、休暇が承認されるとカレンダーにミーティングが設定されます。"
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr "連係を持った申請"
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr "上位"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr "薄紫色"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Month"
+msgstr "月"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr "休暇申請"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr "限界を無効にする。"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr "従業員の休暇"
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,category_id:0
+msgid "Category"
+msgstr "カテゴリー"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr "この値は休暇申請の総計であり、正数です。"
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr "全ての従業員の休暇"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr "サンゴ色"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
+msgstr "部門ごとの休暇"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr "黒"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
+msgid "Allocate Leaves for Employees"
+msgstr "従業員に休暇を割当てる。"
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr "休暇"
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr "ミーティング"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr "象牙色"
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr "承認済み，確認済み"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr "休暇を取得済み"
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr "開始日は終了日の前でなければなりません。"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr "有効"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "Leaves To Validate"
+msgstr "承認すべき休暇"
+
+#. module: hr_holidays
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+msgid "Remaining Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
+msgid "Unpaid"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Holidays during last month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+msgid "Assign Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "My Department Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_state:0
+msgid "Current Leave Status"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the leave "
+"type without removing it."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
+msgid "Compensatory Days"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,color_name:0
+msgid ""
+"This color will be used in the leaves summary located in Reporting\\Leaves "
+"by Departement"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,double_validation:0
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "My Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,holiday_type:0
+msgid ""
+"By Employee: Allocation/Request for individual Employee, By Employee "
+"Category: Allocation/Request for group of employees in category"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you tick this checkbox, the system will allow, for this section, the "
+"employees to take more leaves than the available ones."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,leaves_taken:0
+msgid ""
+"This value is given by the sum of all holidays requests with a negative "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
+msgid ""
+"You can assign remaining Legal Leaves for each employee, OpenERP will "
+"automatically create and validate allocation requests."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid ""
+"This area is automaticly filled by the user who validate the leave with "
+"second level (If Leave type need second validation)"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr ""
diff --git a/addons/hr_payroll/i18n/ja.po b/addons/hr_payroll/i18n/ja.po
index 1d1144a8b6d..c2dafc55d82 100644
--- a/addons/hr_payroll/i18n/ja.po
+++ b/addons/hr_payroll/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-16 01:14+0000\n"
+"PO-Revision-Date: 2012-04-17 18:29+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -81,7 +81,7 @@ msgstr "給与明細"
 #: field:hr.payroll.structure,parent_id:0
 #: field:hr.salary.rule.category,parent_id:0
 msgid "Parent"
-msgstr "親クラス"
+msgstr "上位"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -151,7 +151,7 @@ msgstr "作成"
 #: help:hr.payslip.line,amount_percentage_base:0
 #: help:hr.salary.rule,amount_percentage_base:0
 msgid "result will be affected to a variable"
-msgstr ""
+msgstr "結果は変数に影響します。"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -381,7 +381,7 @@ msgstr "例えば、50%を適用するには50.0と入れてください。"
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Made Payment Order ? "
-msgstr ""
+msgstr "支払いの処理をしましたか？ "
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
diff --git a/addons/hr_payroll_account/i18n/ja.po b/addons/hr_payroll_account/i18n/ja.po
index a7f75f49052..69aa0531675 100644
--- a/addons/hr_payroll_account/i18n/ja.po
+++ b/addons/hr_payroll_account/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-08 06:04+0000\n"
+"PO-Revision-Date: 2012-04-17 18:31+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
 msgid "Accounting Entry"
-msgstr ""
+msgstr "会計入力"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_tax_id:0
@@ -69,7 +69,7 @@ msgstr "給与明細書"
 #. module: hr_payroll_account
 #: constraint:hr.payslip:0
 msgid "Payslip 'Date From' must be before 'Date To'."
-msgstr "給与明細書の「開始日付」は「終了日付」の前でなければいけません。"
+msgstr "給与明細書の「開始日」は「終了日」の前でなければいけません。"
 
 #. module: hr_payroll_account
 #: help:hr.payslip,period_id:0
diff --git a/addons/hr_recruitment/i18n/ja.po b/addons/hr_recruitment/i18n/ja.po
index 21f1898f8b4..9c1494d91fb 100644
--- a/addons/hr_recruitment/i18n/ja.po
+++ b/addons/hr_recruitment/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-15 03:51+0000\n"
+"PO-Revision-Date: 2012-04-17 18:35+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-16 04:41+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -107,7 +107,7 @@ msgstr "この応募者のための業務を定義しなければいけません
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Job"
-msgstr "仕事"
+msgstr "職務"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.partner.create,close:0
@@ -401,7 +401,7 @@ msgstr "予定日"
 #: view:hr.applicant:0 field:hr.applicant,priority:0
 #: field:hr.recruitment.report,priority:0
 msgid "Appreciation"
-msgstr ""
+msgstr "好意的評価"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
@@ -732,7 +732,7 @@ msgstr "件名なし"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Status"
-msgstr ""
+msgstr "状態"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -956,7 +956,7 @@ msgstr "主題 / 応募者"
 #. module: hr_recruitment
 #: help:hr.recruitment.degree,sequence:0
 msgid "Gives the sequence order when displaying a list of degrees."
-msgstr ""
+msgstr "学位の一覧が表示されたら、順番を指定してください。"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0 field:hr.applicant,user_id:0
diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po
index 22afdfa529b..2757a826a06 100644
--- a/addons/hr_timesheet/i18n/ja.po
+++ b/addons/hr_timesheet/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-14 00:48+0000\n"
+"PO-Revision-Date: 2012-04-17 22:36+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-15 04:42+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -33,7 +33,7 @@ msgstr "（現在、空白）"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "No employee defined for your user !"
-msgstr "従業員はユーザとして定義されていません。"
+msgstr "このユーザには従業員が定義されていません。"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -254,17 +254,17 @@ msgstr "開始日"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr "分類"
+msgstr "カテゴリ"
 
 #. module: hr_timesheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "確認済みの勤務表のエントリーを変更することはできません。"
+msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
-msgstr "従業員の割振りを「サービス」という商品項目で指定する。"
+msgstr "従業員の割当てを「サービス」という製品項目で指定する。"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -283,7 +283,7 @@ msgstr "9月"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "タイムシートの行"
+msgstr "勤務表の行"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
@@ -527,7 +527,7 @@ msgstr "この機能で月間勤務表を印刷できます。"
 #: view:hr.analytic.timesheet:0
 #: field:hr.employee,product_id:0
 msgid "Product"
-msgstr "商品"
+msgstr "製品"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -602,6 +602,8 @@ msgid ""
 "No analytic account defined on the project.\n"
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
+"このプロジェクトには分析アカウントが定義されていません。\n"
+"これを設定しないと、勤務表を自動的に記録できません。"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po
new file mode 100644
index 00000000000..c3c8afffa9e
--- /dev/null
+++ b/addons/hr_timesheet_invoice/i18n/ja.po
@@ -0,0 +1,1147 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-17 22:35+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "ユーザごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Timesheet lines in this year"
+msgstr "今年度の勤務表の行"
+
+#. module: hr_timesheet_invoice
+#: view:hr_timesheet_invoice.factor:0
+msgid "Type of invoicing"
+msgstr "請求書のタイプ"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Profit"
+msgstr "利益"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
+msgid "Create invoice from timesheet final"
+msgstr "勤務表から請求書を作成"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Force to use a specific product"
+msgstr "特定の製品を使うことを強制"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "    7 Days    "
+msgstr "    7日    "
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Income"
+msgstr "収益"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily Timesheets for this year"
+msgstr "今年度の日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Re-open project"
+msgstr "プロジェクトを再開"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create.final,name:0
+msgid "Name of entry"
+msgstr "入力の名称"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,pricelist_id:0
+msgid ""
+"The product to invoice is defined on the employee form, the price will be "
+"deduced by this pricelist on the product."
+msgstr "製品と請求額は従業員票で定義します。価格は製品の価格リストによって割引されます。"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:129
+#, python-format
+msgid "You cannot modify an invoiced analytic line!"
+msgstr "請求書を発行済みの分析行を変更することはできません。"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
+msgid "Invoice Rate"
+msgstr "請求書発行率"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Year"
+msgstr "今年度"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,time:0
+msgid "Display time in the history of works"
+msgstr "作業履歴の時間を表示"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+msgid "Journals"
+msgstr "ジャーナル"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "測定単位"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Account"
+msgstr "アカウント"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,time:0
+#: field:hr.timesheet.invoice.create.final,time:0
+msgid "Time spent"
+msgstr "所要時間"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,amount_invoiced:0
+msgid "Invoiced Amount"
+msgstr "請求額"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Uninvoiced line with billing rate"
+msgstr "請求書を未発行率"
+
+#. module: hr_timesheet_invoice
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "請求書番号は会社ごとにユニークでなければいけません。"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: hr_timesheet_invoice
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "会計入力において貸方または借方の値が誤っています。"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,name:0
+msgid "The detail of each work done will be displayed on the invoice"
+msgstr "請求書には各作業の詳細が表示されます。"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:209
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
+msgid "Create invoice from timesheet"
+msgstr "勤務表から請求書を作成"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period to enddate"
+msgstr "終了日までの期間"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "終了する分析アカウント"
+
+#. module: hr_timesheet_invoice
+#: view:board.board:0
+msgid "Uninvoice Lines With Billing Rate"
+msgstr "課金率を持った請求書を未発効の行"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "無効なBBA構造のコミュニケーション"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Create Invoices"
+msgstr "請求書を作成"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "アカウントごとの日々の請求書"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:64
+#, python-format
+msgid "Analytic Account incomplete"
+msgstr "分析アカウントが未完成"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
+#: field:report.timesheet.line,account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "期限"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
+msgid "Accounts to invoice"
+msgstr "請求するアカウント"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "エラー。反復した分析アカウントを作ることはできません"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,time:0
+msgid "The time of each work done will be displayed on the invoice"
+msgstr "請求書には各作業の所要時間が表示されます。"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "勤務表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
+msgid "hr.timesheet.analytic.cost.ledger"
+msgstr "hr.timesheet.analytic.cost.ledger"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,date_from:0
+msgid "From"
+msgstr "から"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "User or Journal Name"
+msgstr "ユーザあるいはジャーナルの名称"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "請求書へ計上する経費"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user in this month"
+msgstr "今月のユーザごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,account_id:0
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "分析アカウント"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
+#, python-format
+msgid "Data Insufficient!"
+msgstr "日付の指定が足りません。"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Debit"
+msgstr "借方"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+msgid "Print"
+msgstr "印刷"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.line,to_invoice:0
+msgid "It allows to set the discount while making invoice"
+msgstr "請求書で割引を指定できます。"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,price:0
+msgid ""
+"The cost of each work done will be displayed on the invoice. You probably "
+"don't want to check this"
+msgstr "各作業の経費を請求書に表示できます。チェックしなくても良いでしょう。"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Force to use a special product"
+msgstr "特殊な製品を使うことを強制する。"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "請求書の行"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:128
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
+msgid "Gratis"
+msgstr "無料"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.line:0
+msgid "To Invoice"
+msgstr "請求書発行"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"Fill this field if you plan to automatically generate invoices based on the "
+"costs in this analytic account: timesheets, expenses, ...You can configure "
+"an automatic invoice rate on analytic accounts."
+msgstr ""
+"この分析アカウントで、経費に基づいて請求書を自動的に発行するのであれば、勤務表、経費…などの項目を入力してください。分析アカウントで請求書の自動発行を設定"
+"することができます。"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
+msgid "Timesheet Profit"
+msgstr "勤務表における利益"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:68
+#, python-format
+msgid "Partner incomplete"
+msgstr "パートナが指定されていません。"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,name:0
+msgid "Display detail of work in the invoice line."
+msgstr "請求行の作業の詳細を表示"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Printing date"
+msgstr "印刷日"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
+msgid "Bill Tasks Works"
+msgstr "課金が"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
+#: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view
+msgid "Types of Invoicing"
+msgstr "請求書の種類"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Theorical"
+msgstr "理論上"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
+#, python-format
+msgid "Configuration Error"
+msgstr "設定エラー"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "請求書への分析行"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,to_invoice:0
+msgid "Invoice on Timesheet & Costs"
+msgstr "勤務表と経費の請求書"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
+msgid "Timesheet by User"
+msgstr "ユーザごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
+msgid "Timesheet by Invoice"
+msgstr "請求書ごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "期限切れの分析カウント"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,factor:0
+msgid "Discount (%)"
+msgstr "割引 (%)"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
+msgid "Yes (100%)"
+msgstr "はい (100%)"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:55
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:220
+#, python-format
+msgid "Invoices"
+msgstr "請求書"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Invoice contract"
+msgstr "請求書の連絡先"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr "選択した仕訳のアカウントは第２の通貨の入力を要求しています。アカウントの第２通貨を削除するか、仕訳で多国通貨ビューを選択して下さい。"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,month:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,month:0
+#: field:report_timesheet.account,month:0
+#: field:report_timesheet.account.date,month:0
+#: field:report_timesheet.user,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Currency"
+msgstr "通貨"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_move_line
+msgid "Journal Items"
+msgstr "仕訳項目"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,product:0
+msgid ""
+"Complete this field only if you want to force to use a specific product. "
+"Keep empty to use the real product that comes from the cost."
+msgstr "特定の製品を使うのであれば、この項目を完成させて下さい。経費でしたい製品を使うのであれば、空欄にして下さい。"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+msgid "Users"
+msgstr "ユーザ"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Non Assigned timesheets to users"
+msgstr "ユーザに割り当てられていない勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.line:0
+#: field:report.timesheet.line,invoice_id:0
+msgid "Invoiced"
+msgstr "請求済み"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "最大数"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr "仕訳エントリーの日付が定義された期間ではありません。日付を変更するか仕訳からこの制約を削除して下さい。"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
+#, python-format
+msgid "No income account defined for product '%s'"
+msgstr "製品 '%s' の収益アカウントが定義されていません。"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Invoice rate by user"
+msgstr "ユーザごとの請求書率"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr "保留"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,amount_invoiced:0
+msgid "Total invoiced"
+msgstr "全ての請求済み"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period to"
+msgstr "期間まで"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "分析行"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_cost_ledger
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr "経費台帳"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
+msgid "50%"
+msgstr "50%"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,date:0
+msgid "Display date in the history of works"
+msgstr "作業履歴の日付を表示"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_stat_all
+msgid "Timesheet by Account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,date:0
+#: field:hr.timesheet.invoice.create.final,date:0
+#: field:report.timesheet.line,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:69
+#, python-format
+msgid "Please fill in the Address field in the Partner: %s."
+msgstr "パートナ %s の住所を入力して下さい。"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "請求書発行"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Eff."
+msgstr "有効"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr "職務カテゴリ / 氏名を移す"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Total:"
+msgstr "合計:"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "閉じたアカウントには仕訳項目を作ることはできません。"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Credit"
+msgstr "貸勘定"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date2:0
+msgid "End of period"
+msgstr "期末"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Do you want to display work details on the invoice ?"
+msgstr "この請求書の作業明細を表示しますか。"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: field:report.analytic.account.close,balance:0
+msgid "Balance"
+msgstr "残高"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "閲覧タイプのアカウントでは仕訳項目を作ることはできません。"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,quantity:0
+#: field:report_timesheet.account,quantity:0
+#: field:report_timesheet.account.date,quantity:0
+#: field:report_timesheet.invoice,quantity:0
+#: field:report_timesheet.user,quantity:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr "日付 / コード"
+
+#. module: hr_timesheet_invoice
+#: field:report.timesheet.line,general_account_id:0
+msgid "General Account"
+msgstr "一般アカウント"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "勤務表プロファイルの印刷"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Totals:"
+msgstr "合計:"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Do you want to show details of work in invoice ?"
+msgstr "請求書の作業明細を表示しますか？"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period from"
+msgstr "期間の開始日"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,amount_max:0
+msgid "Max. Invoice Price"
+msgstr "最大請求価格"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "閲覧アカウントでは分析行を作ることはできません。"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,invoice_id:0
+#: model:ir.model,name:hr_timesheet_invoice.model_account_invoice
+#: view:report.timesheet.line:0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: hr_timesheet_invoice
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,price:0
+msgid "Display cost of the item you reinvoice"
+msgstr "再請求した項目の経費を表示"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
+msgid ""
+"OpenERP allows you to create default invoicing types. You might have to "
+"regularly assign discounts because of a specific contract or agreement with "
+"a customer. From this menu, you can create additional types of invoicing to "
+"speed up your invoicing."
+msgstr ""
+"デフォルトの請求タイプを作ることができます。顧客との契約あるいは取決めに基づいて、割引を定期的に指定する必要があるでしょう。このメニューで追加の請求の定義"
+"を作っておくと請求書作成が簡便になります。"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_analytic_timesheet
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
+#: view:report.timesheet.line:0
+msgid "Timesheet Line"
+msgstr "勤務表の行"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Billing Data"
+msgstr "請求日"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:65
+#, python-format
+msgid ""
+"Please fill in the Partner or Customer and Sale Pricelist fields in the "
+"Analytic Account:\n"
+"%s"
+msgstr ""
+"分析アカウントで、パートナあるいは顧客と販売価格を入力してください。\n"
+"%s"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "会社は関連するアカウントと期間に同じでなければなりません。"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,customer_name:0
+msgid "Label for the customer"
+msgstr "顧客のラベル"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,date_to:0
+msgid "To"
+msgstr "まで"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
+msgid "Create Invoice"
+msgstr "請求書作成"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
+#, python-format
+msgid "At least one line has no product !"
+msgstr "製品が指定されていない行があります。"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,date:0
+msgid "The real date of each work will be displayed on the invoice"
+msgstr "作業の実日付が請求書に表示されます。"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,pricelist_id:0
+msgid "Customer Pricelist"
+msgstr "顧客の価格リスト"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "請求する勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date1:0
+msgid "Start of period"
+msgstr "期間の開始"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
+msgid "Daily Timesheet by Account"
+msgstr "アカウントごとの日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,product:0
+#: field:hr.timesheet.invoice.create.final,product:0
+#: field:report.account.analytic.line.to.invoice,product_id:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
+msgid "Uninvoice lines with billing rate"
+msgstr "請求料率を持つ未請求の行"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "%"
+msgstr "%"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,name:0
+msgid "Internal name"
+msgstr "内部の名称"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,journal_ids:0
+msgid "Journal"
+msgstr "仕訳"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,product:0
+msgid "The product that will be used to invoice the remaining amount"
+msgstr "残高の請求に使われる製品"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+msgid ""
+"This list shows you every task you can invoice to the customer. Select the "
+"lines and click the Action button to generate the invoices automatically."
+msgstr "この票は、顧客への請求できる処理を示します。行を指定してアクション・ボタンをクリックすると、請求書は自動的に作成されます。"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily Timesheets of this month"
+msgstr "今月の日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
+#, python-format
+msgid "No Records Found for Report!"
+msgstr "報告書のためのレコードがありません。"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,amount_max:0
+msgid "Keep empty if this contract is not limited to a total fixed price."
+msgstr "この契約が合計の固定価格に達していなければ、空白にしておいて下さい。"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "請求のための勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Month"
+msgstr "今月"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+msgid "Select Period"
+msgstr "指定した期間"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period from startdate"
+msgstr "開始日からの経過期間"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,customer_name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "アカウントごとの日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "販売価格"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "日ごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Invoicing Data"
+msgstr "請求日"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,factor:0
+msgid "Discount in percentage"
+msgstr "割引パーセント"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:209
+#, python-format
+msgid "Invoice is already linked to some of the analytic line(s)!"
+msgstr "請求は既に分析行に連携されています。"
+
+#. module: hr_timesheet_invoice
+#: view:hr_timesheet_invoice.factor:0
+msgid "Types of invoicing"
+msgstr "請求タイプ"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,name:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+#: field:report.account.analytic.line.to.invoice,unit_amount:0
+msgid "Units"
+msgstr "単位"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user in this year"
+msgstr "今年度のユーザごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "請求のタイプ"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "請求すべき分析行"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Timesheet lines in this month"
+msgstr "今月の勤務表の行"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Invoicing Statistics"
+msgstr "請求の統計"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+#: field:hr.timesheet.invoice.create,price:0
+#: field:hr.timesheet.invoice.create.final,price:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,cost:0
+#: field:report_timesheet.user,cost:0
+msgid "Cost"
+msgstr "経費"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,name:0
+#: field:report_timesheet.account,name:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Timesheet lines during last 7 days"
+msgstr "過去7日間の勤務表の行"
diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po
new file mode 100644
index 00000000000..7e2d71bba64
--- /dev/null
+++ b/addons/hr_timesheet_sheet/i18n/ja.po
@@ -0,0 +1,1042 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-04-18 01:34+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: hr_timesheet_sheet
+#: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.account,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.day,sheet_id:0
+msgid "Sheet"
+msgstr "表"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr "サービス"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "このユーザには従業員が定義されていません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_attendance:0
+#: field:hr_timesheet_sheet.sheet,total_attendance_day:0
+msgid "Total Attendance"
+msgstr "出勤日の合計"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0 view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr "部門"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current year"
+msgstr "今年度の勤務表"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr "仕事時間表"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Today"
+msgstr "今日"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr "表の差分は %.2f よりも小さいことを確認してください。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr "#経費"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet of last month"
+msgstr "先月の勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0 view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
+#: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
+#: view:timesheet.report:0
+msgid "Timesheet"
+msgstr "勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "終了日付"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr "勤務表に基づく"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by day of date"
+msgstr "日付の曜日によってグループ化"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet!"
+msgstr "確認済みの勤務表の記入項を変更することはできません。"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
+msgid "Validate"
+msgstr "検証する"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Approved"
+msgstr "承認済み"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Present"
+msgstr "現在"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr "合計経費"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal!"
+msgstr "この従業員の勤務表を作成するには、分析仕訳に従業員を割り当てる必要があります。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
+msgid "Refuse"
+msgstr "拒否"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid ""
+"You cannot enter an attendance date outside the current timesheet dates!"
+msgstr "勤務表の日付の枠外に出勤日を指定することはできません。"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
+"私の勤務表からあなたの勤務表を開きましたので、あなたの活動をシステムに登録することができます。あなたは出退勤（サインイン / "
+"アウト）を記録して、プロジェクトごとの勤務時間を記録することができます。　プロジェクト期間の終わりに記録を確認して、マネジャが承認することができます。必要"
+"ならば、プロジェクトで定義されたように、あなたが勤務表に基づいて請求書を作成することができます。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Difference"
+msgstr "差分の合計"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid " Month-1 "
+msgstr " 月次-1 "
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "My Departments Timesheet"
+msgstr "私の部門の勤務表"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
+msgid "Timesheet by Day"
+msgstr "日ごとの勤務表"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,name:0
+msgid "Project / Analytic Account"
+msgstr "プロジェクト / 分析アカウント"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr "承認"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr "従業員の勤務表記入項目"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
+#: view:timesheet.report:0 field:timesheet.report,account_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr "#番号"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
+msgid "Date from"
+msgstr "開始日"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+msgid " Month "
+msgstr " 月 "
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "勤務表"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Confirmed"
+msgstr "確認済み"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
+#: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
+msgid "Attendance"
+msgstr "勤怠"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
+msgstr "勤務表の行"
+
+#. module: hr_timesheet_sheet
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な会社を作ることはできません。"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state:0 view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr "状態を確認済み。"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr "週ごとの全ての勤怠"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,total:0
+msgid "Total Time"
+msgstr "合計時間"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
+msgid "Timesheet Lines"
+msgstr "勤務表の行"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr "時間"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by month of date"
+msgstr "日付の月でグループ化"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr "エラー：サインイン（サインアウト）はサインアウト（サインイン）の後でなければいけません。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "Invalid action !"
+msgstr "無効なアクションです。"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr "プロジェクトマネジャが勤務表を承認します。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: hr_timesheet_sheet
+#: view:res.company:0
+msgid "Configuration"
+msgstr "設定"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr "仕掛中の作業"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Daily"
+msgstr "日次"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr "数量"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+#: view:hr_timesheet_sheet.sheet.day:0
+#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
+msgid "Total Timesheet"
+msgstr "全ての勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr "可能な出勤"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign In"
+msgstr "サインイン"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr "勤務表の合計"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr "hr.timesheet.current.open"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Go to:"
+msgstr "次へ進む："
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product, like 'Consultant'!"
+msgstr "この従業員の勤務表を作成するには、従業員を製品（例えば、コンサルタント）に関連付ける必要があります。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr "現在の勤務表が表示されます。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#, python-format
+msgid "You cannot duplicate a timesheet!"
+msgstr "勤務表を重複して作ることはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr "差分の合計"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr "原案中"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product!"
+msgstr "この従業員の勤務表を作成するには、従業員を製品に関連付ける必要があります。"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr "サインイン / アウト"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Waiting Approval"
+msgstr "承認待ち"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr "課金"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr "勤務表の行は、従業員が行ったサービスに費やした時間を表します。"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr "勤務表の日付である現在の日付を選ばなくてはいけません。"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,name:0
+msgid "Note"
+msgstr "注記"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+"この報告書は、システムの人材担当者が作成した勤務表について分析するものです。あなたの従業員が記録した記入項目の全体を見ることができます。さらに検索ツールを"
+"使って、特定の基準でグループ化することができます。"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Draft"
+msgstr "草案"
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr "勤務表の差分の許容範囲（時間）"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr "勤務表に基づいて請求書を作成します。"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr "勤務表の草案"
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "週"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr "承認"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Current Status"
+msgstr "現在の状態"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr "確認済みの勤務表の記入項目を変更することはできません。"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr "期間ごとの勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0 view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
+msgid "Timesheet by Account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
+msgid "Date"
+msgstr "日付"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr "勤務表の範囲"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr "確認済みの勤務表の記入項目を変更することはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "週ごとの私の全ての出勤"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#, python-format
+msgid ""
+"You cannot have 2 timesheets that overlaps!\n"
+"You should use the menu 'My Timesheet' to avoid this problem."
+msgstr ""
+"重複する２つの勤務表を作ることはできません。\n"
+"メニュー「私の勤務表」を使って下さい。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"Check your timesheets for a specific period. You can also encode time spent "
+"on a project (i.e. an analytic account) thus generating costs in the "
+"analytic account concerned."
+msgstr ""
+"指定した期間について勤務表をチェックして下さい。プロジェクトに費やした時間を記録できます。分析アカウントであれば、経費を計上するもができます。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain an equal number of "
+"sign ins and sign outs!"
+msgstr "サインインとサインアウトの回数が同じでないと、勤務表を検証することはできません。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr "従業員のサインインとサインアウト"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Summary"
+msgstr "要約"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid ""
+"You cannot have 2 timesheets that overlaps !\n"
+"Please use the menu 'My Current Timesheet' to avoid this problem."
+msgstr ""
+"重複する２つの勤務表を作ることはできません。\n"
+"メニュー「私の現在の勤務表」を使ってください。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Unvalidated Timesheets"
+msgstr "勤務表を承認しない。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "You cannot delete a timesheet which have attendance entries!"
+msgstr "勤務の記入項目を持った勤務表を削除することはできません。"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#, python-format
+msgid "You cannot delete a timesheet which is already confirmed!"
+msgstr "既に確認した勤務表を削除することはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0 field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr "一般アカウント"
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_range:0
+msgid "Periodicity on which you validate your timesheets."
+msgstr "あなたが承認した勤務表の周期性"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Search Account"
+msgstr "アカウントを検索"
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr "サインイン / アウトの間の時間間隔の許容差分。制約を設けないのであれば 0 （ゼロ）を設定してください。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Period"
+msgstr "期間"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,day:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+msgid "My Timesheet"
+msgstr "私の勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr "「草稿」状態"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "承諾済み"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "作業中の請求"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current month"
+msgstr "今月の勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Timesheet by Accounts"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
+#, python-format
+msgid "Open Timesheet"
+msgstr "勤務表を開く"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by year of date"
+msgstr "日付の年度でグループ化"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr "承認された状態"
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
+" ・「草案」状態とは、ユーザが新しい勤務表を記録中であり未確認であることを示します。\n"
+"・「確認済み」状態とは、ユーザ自身が確認した勤務表であることを示します。\n"
+"・「完了」状態とは、上司が承認した勤務表であることを示します。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr "勤務表の分析"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr "勤務表を検索"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Confirmed Timesheets"
+msgstr "確認済みの勤務表"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "勤務表の行"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0 field:timesheet.report,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,attendances_ids:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
+msgid "Attendances"
+msgstr "勤怠"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0 field:timesheet.report,name:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr "従業員は定期的に自分の勤務表を確認すること。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "仕事の作業要約を定義します。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign Out"
+msgstr "ログオフ"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr "作業の記入項目を勤務表に移します。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Attendances"
+msgstr "出勤日の合計"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr "勤務表の分析"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_difference:0
+#: field:hr_timesheet_sheet.sheet,total_difference_day:0
+#: field:hr_timesheet_sheet.sheet.day,total_difference:0
+msgid "Difference"
+msgstr "差分"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Absent"
+msgstr "欠勤"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: hr_timesheet_sheet
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr "従業員"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr "サービスに費やした時間の情報"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr "確認"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
+msgid "Invoice rate"
+msgstr "請求率"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid "UserError"
+msgstr "ユーザエラー"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal, like 'Timesheet'!"
+msgstr "この従業員の勤務表を作成するには、従業員に分析項目（例えば、勤務表）を割り当ててください。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#, python-format
+msgid "You cannot sign in/sign out from an other date than today"
+msgstr "今日とは別の日付でサインイン / サインアウトすることはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Submited to Manager"
+msgstr "マネジャに提出済み"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,account_ids:0
+msgid "Analytic accounts"
+msgstr "分析アカウント"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "請求のタイプ"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign it to a "
+"user!"
+msgstr "この従業員の勤務表を作成するには、それをユーザに割り当てなければいけません。"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr "出勤日の合計日数"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr "経費"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
+msgid "Current date"
+msgstr "今日"
+
+#. module: hr_timesheet_sheet
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr "人材　勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
+#: view:timesheet.report:0 field:timesheet.report,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
+msgid "Open"
+msgstr "オープン"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr "承認する"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Total"
+msgstr "合計"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "仕訳"
diff --git a/addons/html_view/i18n/ja.po b/addons/html_view/i18n/ja.po
new file mode 100644
index 00000000000..8820fdd9f33
--- /dev/null
+++ b/addons/html_view/i18n/ja.po
@@ -0,0 +1,49 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 01:30+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "HTMLテスト"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "HTML例"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "銀行"
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "HTMLビュー"
diff --git a/addons/import_sugarcrm/i18n/fr.po b/addons/import_sugarcrm/i18n/fr.po
new file mode 100644
index 00000000000..cbbe4c99743
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/fr.po
@@ -0,0 +1,404 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-17 13:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "Error !!"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "(Coming Soon)"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,document:0
+msgid "Documents"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import your data from SugarCRM :"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Choose data you want to import. Click 'Import' to get data manually or "
+"'Schedule Reccurent Imports' to get recurrently and automatically data."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,contact:0
+msgid "Contacts"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "HR"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,bug:0
+msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,instance_name:0
+msgid "Instance's Name"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project_task:0
+msgid "Project Tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_from:0
+msgid "Notify End Of Import To:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,user:0
+msgid ""
+"Check this box to import sugarCRM Users into OpenERP users, warning if a "
+"user with the same login exist in OpenERP, user information will be erase by "
+"sugarCRM user information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#, python-format
+msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Schedule Recurrent Imports"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Do not forget the email address to be notified of the success of the import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,call:0
+msgid "Check this box to import sugarCRM Calls into OpenERP calls"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"If you make recurrent or ponctual import, data already  in OpenERP will be "
+"updated by SugarCRM data."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,employee:0
+msgid "Employee"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Document"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,document:0
+msgid "Check this box to import sugarCRM Documents into OpenERP documents"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import Data From SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid ""
+"Data are importing, the process is running in the background, an email will "
+"be sent to the given email address if it was defined."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,call:0
+msgid "Calls"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Multi Instance Management"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,opportunity:0
+msgid ""
+"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
+"and Opportunities"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_history:0
+msgid "Email and Note"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,url:0
+msgid ""
+"Webservice's url where to get the data.                      example : "
+"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
+"application "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
+#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
+msgid "Import SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,user:0
+msgid "User"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "%s data required %s Module to be installed, Please install %s module"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,claim:0
+msgid "Cases"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,meeting:0
+msgid ""
+"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,email_history:0
+msgid ""
+"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
+"Messages and Attachments"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project:0
+msgid "Projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid ""
+"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
+"http://pypi.python.org/pypi/ZSI/"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project:0
+msgid "Check this box to import sugarCRM Projects into OpenERP projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Select Module to Import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,meeting:0
+msgid "Meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,employee:0
+msgid "Check this box to import sugarCRM Employees into OpenERP employees"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,url:0
+msgid "SugarSoap Api url:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Address Book"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,bug:0
+msgid "Bugs"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Project"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project_task:0
+msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,opportunity:0
+msgid "Leads & Opp"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password or bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,instance_name:0
+msgid ""
+"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
+"from different server."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,contact:0
+msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,password:0
+msgid "Password"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Login Information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,claim:0
+msgid "Check this box to import sugarCRM Cases into OpenERP claims"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Notification When Import is finished"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,username:0
+msgid "User Name"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+#: model:ir.model,name:import_sugarcrm.model_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,account:0
+msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Online documentation:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,account:0
+msgid "Accounts"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid "ZSI Import Error!"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr ""
diff --git a/addons/web_dashboard/i18n/sv.po b/addons/web_dashboard/i18n/sv.po
new file mode 100644
index 00000000000..dd70f52088c
--- /dev/null
+++ b/addons/web_dashboard/i18n/sv.po
@@ -0,0 +1,112 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-04-17 09:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:63
+msgid "Edit Layout"
+msgstr "Ändra layout"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:109
+msgid "Are you sure you want to remove this item ?"
+msgstr "Är du säker på att du vill radera?"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:316
+msgid "Uncategorized"
+msgstr "Okategoriserad"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:324
+#, python-format
+msgid "Execute task \"%s\""
+msgstr "Utför åtgärd \"%s\""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:325
+msgid "Mark this task as done"
+msgstr "Markera denna uppgift som färdig"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
+msgid "Reset Layout.."
+msgstr "Återställ layouten"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
+msgid "Reset"
+msgstr "Nollställ"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:8
+msgid "Change Layout.."
+msgstr "Ändra layout..."
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
+msgid "Change Layout"
+msgstr "Ändra layout"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
+msgid "&nbsp;"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:28
+msgid "Create"
+msgstr "Skapa"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
+msgid "Choose dashboard layout"
+msgstr "Välj infopanellayout"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:62
+msgid "progress:"
+msgstr "framsteg:"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:67
+msgid ""
+"Click on the functionalites listed below to launch them and configure your "
+"system"
+msgstr ""
+"Välj bland funktionerna nedan för att starta och konfigurera ditt system"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:110
+msgid "Welcome to OpenERP"
+msgstr "Välkommen till OpenERP"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:118
+msgid "Remember to bookmark"
+msgstr "Kom ihåg att spara ett bokmärke till"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:119
+msgid "This url"
+msgstr "denna url"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:121
+msgid "Your login:"
+msgstr "Din inloggning:"
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
new file mode 100644
index 00000000000..da5bb3fbcdd
--- /dev/null
+++ b/addons/web_diagram/i18n/sv.po
@@ -0,0 +1,57 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-17 13:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:11
+msgid "Diagram"
+msgstr "Diagram"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:224
+#: addons/web_diagram/static/src/js/diagram.js:257
+msgid "Activity"
+msgstr "Aktivitet"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:289
+#: addons/web_diagram/static/src/js/diagram.js:308
+msgid "Transition"
+msgstr "Övergång"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:214
+#: addons/web_diagram/static/src/js/diagram.js:262
+#: addons/web_diagram/static/src/js/diagram.js:314
+msgid "Create:"
+msgstr "Skapa:"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:231
+#: addons/web_diagram/static/src/js/diagram.js:232
+#: addons/web_diagram/static/src/js/diagram.js:296
+msgid "Open: "
+msgstr "Öppna: "
+
+#. openerp-web
+#: addons/web_diagram/static/src/xml/base_diagram.xml:5
+#: addons/web_diagram/static/src/xml/base_diagram.xml:6
+msgid "New Node"
+msgstr "Ny nod"
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
new file mode 100644
index 00000000000..98335a89577
--- /dev/null
+++ b/addons/web_graph/i18n/sv.po
@@ -0,0 +1,23 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-17 13:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Diagram"
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
new file mode 100644
index 00000000000..ad96ac598d2
--- /dev/null
+++ b/addons/web_kanban/i18n/sv.po
@@ -0,0 +1,55 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-04-17 12:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:10
+msgid "Kanban"
+msgstr "Kanban"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:294
+#: addons/web_kanban/static/src/js/kanban.js:295
+msgid "Undefined"
+msgstr "Odefinierad"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:469
+#: addons/web_kanban/static/src/js/kanban.js:470
+msgid "Are you sure you want to delete this record ?"
+msgstr "Är du säker på att du vill radera denna post?"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:5
+msgid "Create"
+msgstr "Skapa"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "Show more... ("
+msgstr "Visa mer... ("
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "remaining)"
+msgstr "återstående)"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:59
+msgid "</tr><tr>"
+msgstr "</tr><tr>"
diff --git a/addons/web_mobile/i18n/sv.po b/addons/web_mobile/i18n/sv.po
new file mode 100644
index 00000000000..d0dc990c7c8
--- /dev/null
+++ b/addons/web_mobile/i18n/sv.po
@@ -0,0 +1,106 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-07 10:13+0100\n"
+"PO-Revision-Date: 2012-04-17 12:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:17
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:22
+msgid "Database:"
+msgstr "Databas:"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:30
+msgid "Login:"
+msgstr "Användarnamn:"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:32
+msgid "Password:"
+msgstr "Lösenord:"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:34
+msgid "Login"
+msgstr "Logga in"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:36
+msgid "Bad username or password"
+msgstr "Fel användanamn eller lösenord"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:42
+msgid "Powered by openerp.com"
+msgstr "Baserad på openerp.com"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:49
+msgid "Home"
+msgstr "Hem"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:57
+msgid "Favourite"
+msgstr "Favorit"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:58
+msgid "Preference"
+msgstr "Inställning"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:123
+msgid "Logout"
+msgstr "Logga ut"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:132
+msgid "There are no records to show."
+msgstr "Det finns inte några poster att visa."
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:183
+msgid "Open this resource"
+msgstr "Öppna denna resurs"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:223
+#: addons/web_mobile/static/src/xml/web_mobile.xml:226
+msgid "Percent of tasks closed according to total of tasks to do..."
+msgstr "Andel avslutade uppgifter i jämförelse med alla..."
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:264
+#: addons/web_mobile/static/src/xml/web_mobile.xml:268
+msgid "On"
+msgstr "På"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:265
+#: addons/web_mobile/static/src/xml/web_mobile.xml:269
+msgid "Off"
+msgstr "Av"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:294
+msgid "Form View"
+msgstr "Formulär"
diff --git a/addons/web_process/i18n/bs.po b/addons/web_process/i18n/bs.po
new file mode 100644
index 00000000000..7685aeea7ff
--- /dev/null
+++ b/addons/web_process/i18n/bs.po
@@ -0,0 +1,118 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-07 19:19+0100\n"
+"PO-Revision-Date: 2012-04-17 17:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Spasi"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr "Pregled Procesa"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Čitaj Dokumentaciju Online"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Forum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Zajednička Diskusija"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Knjige"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr "Nabavite knjige"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr "Pokreni OpenERP"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr "Kupi OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr "Proces"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Bilješke:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Posljednje modifikovano od:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr "N/A"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Srodnost:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Odabrani Proces"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Izaberi"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr "Edituj proces"
diff --git a/addons/web_process/i18n/sv.po b/addons/web_process/i18n/sv.po
new file mode 100644
index 00000000000..f054ab1ce45
--- /dev/null
+++ b/addons/web_process/i18n/sv.po
@@ -0,0 +1,118 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-07 19:19+0100\n"
+"PO-Revision-Date: 2012-04-17 12:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Spara"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr "Processvy"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Läs online-dokumentationen"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Forum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Diskussion i användarföreningen"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Böcker"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr "Komma över böckerna"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr "OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr "Köp OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr "Process"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Anteckningar:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Senast ändrad av:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr "Ej tillgänglig"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr "Underflöde"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Relaterad:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Välj process"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Välj"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr "Ändra processen"

From 3930d41621dddd023f62ad0695528367a9773127 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Apr 2012 10:47:42 +0200
Subject: [PATCH 90/90] [IMP] hr.config.settings: small fix in view

bzr revid: rco@openerp.com-20120418084742-ruboxpqeggpzu2sh
---
 addons/hr/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 3377ad20c37..a34783772c9 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -42,7 +42,7 @@
         </record>
 
         <record id="action_human_resources_configuration" model="ir.actions.act_window">
-            <field name="name">Configure Human Resources Application</field>
+            <field name="name">Configure Human Resources</field>
             <field name="res_model">hr.config.settings</field>
             <field name="view_id" ref="view_human_resources_configuration"/>
             <field name="view_mode">form</field>