[MERGE] branch merge with lp:~openerp-dev/openobject-addons/trunk-v62_config

bzr revid: jap@tinyerp.com-20120405050839-97ifqjla5bz48duc

603 files changed, 13103 insertions, 28458 deletions

diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index 98f7a7d5134..90fbdb83980 100644
--- a/addons/account/__init__.py
+++ b/addons/account/__init__.py
@@ -37,4 +37,6 @@ import ir_sequence
 import company
 import res_currency
 import edi
+import res_config
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 850a8f49842..fba1bd8736f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -125,6 +125,7 @@ module named account_voucher.
         'board_account_view.xml',
         "edi/invoice_action_data.xml",
         "account_bank_view.xml",
+        "res_config_view.xml",
         "account_pre_install.yml"
     ],
     'demo_xml': [
diff --git a/addons/account/account.py b/addons/account/account.py
index c1a30967aea..75bfc891980 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1079,7 +1079,7 @@ class account_period(osv.osv):
 
     def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
         if period_from_id == period_to_id:
-            return period_from_id
+            return [period_from_id]
         period_from = self.browse(cr, uid, period_from_id)
         period_date_start = period_from.date_start
         company1_id = period_from.company_id.id
@@ -1652,7 +1652,7 @@ class account_move_reconcile(osv.osv):
         'create_date': fields.date('Creation date', readonly=True),
     }
     _defaults = {
-        'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
+        'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/',
     }
 
     def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
@@ -1841,7 +1841,7 @@ class account_tax(osv.osv):
         PERCENT: tax = price * amount
         FIXED: tax = price + amount
         NONE: no tax line
-        CODE: execute python code. localcontext = {'price_unit':pu, 'address':address_object}
+        CODE: execute python code. localcontext = {'price_unit':pu}
             return result in the context
             Ex: result=round(price_unit*0.21,4)
     """
@@ -1963,8 +1963,8 @@ class account_tax(osv.osv):
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
 
     _defaults = {
-        'python_compute': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
-        'python_compute_inv': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
+        'python_compute': '''# price_unit\n# or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
+        'python_compute_inv': '''# price_unit\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
         'applicable_type': 'true',
         'type': 'percent',
         'amount': 0,
@@ -1981,12 +1981,11 @@ class account_tax(osv.osv):
     }
     _order = 'sequence'
 
-    def _applicable(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
+    def _applicable(self, cr, uid, taxes, price_unit, product=None, partner=None):
         res = []
-        obj_partener_address = self.pool.get('res.partner.address')
         for tax in taxes:
             if tax.applicable_type=='code':
-                localdict = {'price_unit':price_unit, 'address':obj_partener_address.browse(cr, uid, address_id), 'product':product, 'partner':partner}
+                localdict = {'price_unit':price_unit, 'product':product, 'partner':partner}
                 exec tax.python_applicable in localdict
                 if localdict.get('result', False):
                     res.append(tax)
@@ -1994,11 +1993,10 @@ class account_tax(osv.osv):
                 res.append(tax)
         return res
 
-    def _unit_compute(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None, quantity=0):
-        taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
+    def _unit_compute(self, cr, uid, taxes, price_unit, product=None, partner=None, quantity=0):
+        taxes = self._applicable(cr, uid, taxes, price_unit ,product, partner)
         res = []
         cur_price_unit=price_unit
-        obj_partener_address = self.pool.get('res.partner.address')
         for tax in taxes:
             # we compute the amount for the current tax object and append it to the result
             data = {'id':tax.id,
@@ -2026,8 +2024,7 @@ class account_tax(osv.osv):
                 data['tax_amount']=quantity
                # data['amount'] = quantity
             elif tax.type=='code':
-                address = address_id and obj_partener_address.browse(cr, uid, address_id) or None
-                localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
+                localdict = {'price_unit':cur_price_unit, 'product':product, 'partner':partner}
                 exec tax.python_compute in localdict
                 amount = localdict['result']
                 data['amount'] = amount
@@ -2040,7 +2037,7 @@ class account_tax(osv.osv):
                 if tax.child_depend:
                     latest = res.pop()
                 amount = amount2
-                child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, address_id, product, partner, quantity)
+                child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, product, partner, quantity)
                 res.extend(child_tax)
                 if tax.child_depend:
                     for r in res:
@@ -2060,7 +2057,7 @@ class account_tax(osv.osv):
                 cur_price_unit+=amount2
         return res
 
-    def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None, force_excluded=False):
+    def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, force_excluded=False):
         """
         :param force_excluded: boolean used to say that we don't want to consider the value of field price_include of
             tax. It's used in encoding by line where you don't matter if you encoded a tax with that boolean to True or
@@ -2080,7 +2077,7 @@ class account_tax(osv.osv):
                 tex.append(tax)
             else:
                 tin.append(tax)
-        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
+        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner)
         for r in tin:
             totalex -= r.get('amount', 0.0)
         totlex_qty = 0.0
@@ -2088,7 +2085,7 @@ class account_tax(osv.osv):
             totlex_qty = totalex/quantity
         except:
             pass
-        tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
+        tex = self._compute(cr, uid, tex, totlex_qty, quantity,product=product, partner=partner)
         for r in tex:
             totalin += r.get('amount', 0.0)
         return {
@@ -2097,13 +2094,13 @@ class account_tax(osv.osv):
             'taxes': tin + tex
         }
 
-    def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+    def compute(self, cr, uid, taxes, price_unit, quantity,  product=None, partner=None):
         logger = netsvc.Logger()
         logger.notifyChannel("warning", netsvc.LOG_WARNING,
             "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
-        return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
+        return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
 
-    def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+    def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
@@ -2112,7 +2109,7 @@ class account_tax(osv.osv):
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
-        res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
+        res = self._unit_compute(cr, uid, taxes, price_unit, product, partner, quantity)
         total = 0.0
         precision_pool = self.pool.get('decimal.precision')
         for r in res:
@@ -2123,9 +2120,8 @@ class account_tax(osv.osv):
                 total += r['amount']
         return res
 
-    def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
-        taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
-        obj_partener_address = self.pool.get('res.partner.address')
+    def _unit_compute_inv(self, cr, uid, taxes, price_unit, product=None, partner=None):
+        taxes = self._applicable(cr, uid, taxes, price_unit,  product, partner)
         res = []
         taxes.reverse()
         cur_price_unit = price_unit
@@ -2150,8 +2146,7 @@ class account_tax(osv.osv):
                 amount = tax.amount
 
             elif tax.type=='code':
-                address = address_id and obj_partener_address.browse(cr, uid, address_id) or None
-                localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
+                localdict = {'price_unit':cur_price_unit, 'product':product, 'partner':partner}
                 exec tax.python_compute_inv in localdict
                 amount = localdict['result']
             elif tax.type=='balance':
@@ -2185,7 +2180,7 @@ class account_tax(osv.osv):
                     del res[-1]
                     amount = price_unit
 
-            parent_tax = self._unit_compute_inv(cr, uid, tax.child_ids, amount, address_id, product, partner)
+            parent_tax = self._unit_compute_inv(cr, uid, tax.child_ids, amount, product, partner)
             res.extend(parent_tax)
 
         total = 0.0
@@ -2197,7 +2192,7 @@ class account_tax(osv.osv):
             r['todo'] = 0
         return res
 
-    def compute_inv(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+    def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
         Price Unit is a VAT included price
@@ -2207,7 +2202,7 @@ class account_tax(osv.osv):
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
-        res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
+        res = self._unit_compute_inv(cr, uid, taxes, price_unit, product, partner=None)
         total = 0.0
         obj_precision = self.pool.get('decimal.precision')
         for r in res:
@@ -2806,8 +2801,8 @@ class account_tax_template(osv.osv):
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
 
     _defaults = {
-        'python_compute': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
-        'python_compute_inv': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
+        'python_compute': lambda *a: '''# price_unit\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
+        'python_compute_inv': lambda *a: '''# price_unit\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
         'applicable_type': 'true',
         'type': 'percent',
         'amount': 0,
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index 5a84dee53de..cbc5a966f79 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -55,7 +55,7 @@ class bank(osv.osv):
                 # Find the code and parent of the bank account to create
                 dig = 6
                 current_num = 1
-                ids = obj_acc.search(cr, uid, [('type','=','liquidity')], context=context)
+                ids = obj_acc.search(cr, uid, [('type','=','liquidity'), ('company_id', '=', bank.company_id.id)], context=context)
                 # No liquidity account exists, no template available
                 if not ids: continue
 
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index c1f787f5d80..5601179e0fc 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -341,11 +341,11 @@ class account_bank_statement(osv.osv):
             if not st.name == '/':
                 st_number = st.name
             else:
+                c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
                 if st.journal_id.sequence_id:
-                    c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
                     st_number = obj_seq.next_by_id(cr, uid, st.journal_id.sequence_id.id, context=c)
                 else:
-                    st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement')
+                    st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement', context=c)
 
             for line in st.move_line_ids:
                 if line.state <> 'valid':
diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 8d0b1aa5db3..df754da7f90 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -50,13 +50,5 @@
         id="menu_action_bank_tree"
         action="action_bank_tree"/>
 
-
-    <record id="account_configuration_bank_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_bank_tree"/>
-        <field name="category_id" ref="category_accounting_configuration"/>
-        <field name="sequence">4</field>
-    </record>
-
-
 </data>
 </openerp>
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 2768fd83019..f19c1e1c639 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -279,11 +279,11 @@ class account_cash_statement(osv.osv):
                 raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
 
             if statement.name and statement.name == '/':
+                c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
                 if statement.journal_id.sequence_id:
-                    c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
                     st_number = obj_seq.next_by_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
                 else:
-                    st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement')
+                    st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement', context=c)
                 vals.update({
                     'name': st_number
                 })
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 430d65e0bf9..8c2865ea9b9 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -62,48 +62,5 @@
             <field name="type">automatic</field>
         </record>
 
-        <record id="action_view_financial_accounts_installer" model="ir.actions.act_window">
-            <field name="name">Review your Financial Accounts</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.account</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'config_invisible': False}</field>
-        </record>
-
-        <record id="view_financial_accounts_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_view_financial_accounts_installer" />
-            <field name="category_id" ref="category_accounting_configuration" />
-            <field name="groups_id" eval="[(6, 0, [ref('account.group_account_user')])]" />
-        </record>
-
-        <record id="action_review_financial_journals_installer" model="ir.actions.act_window">
-            <field name="name">Review your Financial Journals</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help">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.</field>
-        </record>
-
-        <record id="review_financial_journals_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_review_financial_journals_installer" />
-            <field name="category_id" ref="category_accounting_configuration" />
-            <field name="groups_id" eval="[(6, 0, [ref('account.group_account_user')])]" />
-        </record>
-        <record id="action_review_payment_terms_installer" model="ir.actions.act_window">
-            <field name="name">Review your Payment Terms</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.payment.term</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help">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.</field>
-        </record>
-
-        <record id="review_payment_terms_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_review_payment_terms_installer" />
-            <field name="category_id" ref="category_accounting_configuration" />
-            <field name="groups_id" eval="[(6, 0, [ref('account.group_account_user')])]" />
-        </record>
     </data>
 </openerp>
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 5e5ac5f482b..700936695b8 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -216,8 +216,6 @@ class account_invoice(osv.osv):
             help="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."),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
-        'address_contact_id': fields.many2one('res.partner.address', 'Contact Address', readonly=True, states={'draft':[('readonly',False)]}),
-        'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]},
             help="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. "\
@@ -396,7 +394,6 @@ class account_invoice(osv.osv):
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
             date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         invoice_addr_id = False
-        contact_addr_id = False
         partner_payment_term = False
         acc_id = False
         bank_id = False
@@ -406,8 +403,7 @@ class account_invoice(osv.osv):
         if partner_id:
 
             opt.insert(0, ('id', partner_id))
-            res = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['contact', 'invoice'])
-            contact_addr_id = res['contact']
+            res = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['invoice'])
             invoice_addr_id = res['invoice']
             p = self.pool.get('res.partner').browse(cr, uid, partner_id)
             if company_id:
@@ -442,8 +438,6 @@ class account_invoice(osv.osv):
                 bank_id = p.bank_ids[0].id
 
         result = {'value': {
-            'address_contact_id': contact_addr_id,
-            'address_invoice_id': invoice_addr_id,
             'account_id': acc_id,
             'payment_term': partner_payment_term,
             'fiscal_position': fiscal_position
@@ -1092,7 +1086,7 @@ class account_invoice(osv.osv):
         return map(lambda x: (0,0,x), lines)
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
-        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
+        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
         obj_invoice_line = self.pool.get('account.invoice.line')
         obj_invoice_tax = self.pool.get('account.invoice.tax')
         obj_journal = self.pool.get('account.journal')
@@ -1140,7 +1134,7 @@ class account_invoice(osv.osv):
                     'name': description,
                 })
             # take the id part of the tuple returned for many2one fields
-            for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
+            for field in ('partner_id',
                     'account_id', 'currency_id', 'payment_term', 'journal_id'):
                 invoice[field] = invoice[field] and invoice[field][0]
             # create the new invoice
@@ -1257,7 +1251,7 @@ class account_invoice_line(osv.osv):
         cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids):
             price = line.price_unit * (1-(line.discount or 0.0)/100.0)
-            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, address_id=line.invoice_id.address_invoice_id, partner=line.invoice_id.partner_id)
+            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, partner=line.invoice_id.partner_id)
             res[line.id] = taxes['total']
             if line.invoice_id:
                 cur = line.invoice_id.currency_id
@@ -1277,7 +1271,7 @@ class account_invoice_line(osv.osv):
                     taxes = l[2].get('invoice_line_tax_id')
                     if len(taxes[0]) >= 3 and taxes[0][2]:
                         taxes = tax_obj.browse(cr, uid, list(taxes[0][2]))
-                        for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
+                        for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
                             t = t - tax['amount']
             return t
         return 0
@@ -1322,7 +1316,7 @@ class account_invoice_line(osv.osv):
             res['arch'] = etree.tostring(doc)
         return res
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
         if context is None:
             context = {}
         company_id = company_id if company_id != None else context.get('company_id',False)
@@ -1397,14 +1391,14 @@ class account_invoice_line(osv.osv):
                 res_final['value']['price_unit'] = new_price
         return res_final
 
-    def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
+    def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
         if context is None:
             context = {}
         company_id = company_id if company_id != None else context.get('company_id',False)
         context = dict(context)
         context.update({'company_id': company_id})
         warning = {}
-        res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context)
+        res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context=context)
         if 'uos_id' in res['value']:
             del res['value']['uos_id']
         if not uom:
@@ -1437,7 +1431,7 @@ class account_invoice_line(osv.osv):
             tax_code_found= False
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
                     (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
-                    line.quantity, inv.address_invoice_id.id, line.product_id,
+                    line.quantity, line.product_id,
                     inv.partner_id)['taxes']:
 
                 if inv.type in ('out_invoice', 'in_invoice'):
@@ -1572,7 +1566,7 @@ class account_invoice_tax(osv.osv):
         company_currency = inv.company_id.currency_id.id
 
         for line in inv.invoice_line:
-            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
                 tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit'])
                 val={}
                 val['invoice_id'] = inv.id
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 59977c252f9..ef6c2510c54 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -51,12 +51,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Line">
-                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, context, parent.company_id)"/>
+                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                     <field colspan="2" name="name"/>
                     <label string="Quantity :" align="1.0"/>
                     <group colspan="1" col="2">
                         <field name="quantity" nolabel="1"/>
-                        <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, context, parent.company_id)" nolabel="1"/>
+                        <field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1"/>
                     </group>
                     <field name="price_unit"/>
                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
@@ -153,7 +153,6 @@
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                         <newline/>
                         <field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" options='{"quick_create": false}' domain="[('supplier', '=', True)]"/>
-                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" context="{'default_partner_id': partner_id}" options='{"quick_create": false}'/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
                         <field name="date_invoice"/>
@@ -168,9 +167,9 @@
                             <field name="reference_type" nolabel="1" size="0"/>
                             <field name="reference" nolabel="1"/>
                             <field name="date_due"/>
-                            <field colspan="4" context="{'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line" nolabel="1">
+                            <field colspan="4" context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line" nolabel="1">
                                 <tree string="Invoice lines">
-                                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, context, parent.company_id)"/>
+                                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
@@ -223,7 +222,6 @@
                             <field name="name"/>
                             <newline/>
                             <field name="origin" groups="base.group_extended"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
                             <field name="user_id"/>
                             <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
@@ -263,7 +261,6 @@
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     <newline/>
                     <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}" options='{"quick_create": false}' domain="[('customer', '=', True)]"/>
-                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" context="{'default_partner_id': partner_id}" options='{"quick_create": false}'/>
                     <field name="fiscal_position" groups="base.group_extended" widget="selection" options='{"quick_create": false}'/>
                     <newline/>
                     <field name="date_invoice"/>
@@ -306,7 +303,7 @@
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="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."/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                     <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
                                 </group>
@@ -321,8 +318,6 @@
                             <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"
                                 groups="base.group_extended"/>
                             <field name="origin"/>
-                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
-                                groups="base.group_extended"/>
                             <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
@@ -355,7 +350,7 @@
                 <search string="Search Invoice">
                    <group>
                         <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
+                        <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                         <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 6c651405c92..f06a456037f 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -10,27 +10,28 @@
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
             groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="9" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="13" groups="group_account_user,group_account_manager"/>
         <!-- This menu is used in account_code module -->
         <menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
         <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="6"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="13"/>
+        <menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
-        <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="14" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reports"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="14" groups="group_account_manager"/>
-        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager"/>
+        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" sequence="1"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting" sequence="40"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
-        <menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="group_account_manager"/>
-        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30"/>
-        <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
-        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
+        <menuitem id="menu_journals" sequence="15" name="Journals" parent="menu_finance_configuration" groups="group_account_manager"/>
+        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="55"/>
+        <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20" groups="base.group_no_one"/>
+        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reports" sequence="100"/>
         <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_accounting" sequence="18"/>
+        <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_configuration" sequence="30" />
 
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
             parent="menu_finance_periodical_processing" sequence="15"
diff --git a/addons/account/account_pre_install.yml b/addons/account/account_pre_install.yml
index 13adbe8108f..e295989e698 100644
--- a/addons/account/account_pre_install.yml
+++ b/addons/account/account_pre_install.yml
@@ -7,8 +7,8 @@
     wiz = wizards.browse(cr, uid, ref('account.account_configuration_installer_todo'))
     part = self.pool.get('res.partner').browse(cr, uid, ref('base.main_partner'))
     # if we know the country and the wizard has not yet been executed, we do it
-    if (part.country.id) and (wiz.state=='open'):
-        mod = 'l10n_'+part.country.code.lower()
+    if (part.country_id.id) and (wiz.state=='open'):
+        mod = 'l10n_'+part.country_id.code.lower()
         ids = modules.search(cr, uid, [ ('name','=',mod) ], context=context)
         if ids:
             wizards.write(cr, uid, [ref('account.account_configuration_installer_todo')], {
diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml
index c810e6a1080..ad4540b9806 100644
--- a/addons/account/account_unit_test.xml
+++ b/addons/account/account_unit_test.xml
@@ -5,14 +5,12 @@
         <record id="test_invoice_1" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_tang"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="account.a_recv"/>
             <field name="name">Test invoice 1</field>
-            <field name="address_contact_id" ref="base.res_partner_address_tang"/>
         </record>
         <record id="test_tax_line" model="account.invoice.tax">
             <field name="name">Test Tax</field>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3d782c2b4c4..66e5201e214 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -80,7 +80,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help">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.</field>
         </record>
-        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_accounting" sequence="8" />
+        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="5" />
         <menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
 
         <!--
@@ -149,7 +149,7 @@
             <field name="context">{'search_default_draft': 1}</field>
             <field name="help">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.</field>
         </record>
-        <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23"/>
+        <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23" groups="base.group_no_one"/>
 
 
         <!--
@@ -265,7 +265,7 @@
             <field name="view_id" ref="view_account_list"/>
             <field name="help">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.</field>
         </record>
-        <menuitem id="account_account_menu" name="Accounts" parent="menu_finance_accounting"/>
+        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="15"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
 
         <record id="view_account_tree" model="ir.ui.view">
@@ -740,7 +740,7 @@
         </record>
 
         <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
-        <menuitem name="Statements Reconciliation" action="action_bank_statement_periodic_tree" id="menu_menu_Bank_process" parent="account.menu_account_pp_statements" sequence="7"/>
+        <menuitem name="Statements Reconciliation" action="action_bank_statement_periodic_tree" id="menu_menu_Bank_process" parent="account.periodical_processing_reconciliation" sequence="15"/>
 
 
         <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
@@ -810,7 +810,7 @@
             <field name="search_view_id" ref="view_account_type_search"/>
             <field name="help">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.</field>
         </record>
-        <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_extended"/>
+        <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
         <!--
     Entries
     -->
@@ -923,8 +923,8 @@
             <field name="search_view_id" ref="view_tax_code_search"/>
             <field name="help">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.</field>
         </record>
-       <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/>
-       <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12"/>
+       <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="20"/>
+       <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12" groups="base.group_no_one"/>
 
 
         <!--
@@ -2505,15 +2505,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
            <field name="name">New Company Financial Setting</field>
         </record>
 
-
-        <record id="menu_act_ir_actions_bleble" model="ir.ui.menu">
-            <field name="name">New Company Financial Setting</field>
-            <field eval="1" name="sequence"/>
-            <field name="parent_id" ref="account.menu_finance_accounting"/>
-            <field name="icon">STOCK_EXECUTE</field>
-            <field name="action" ref="ir_actions_server_action_wizard_multi_chart"/>
-        </record>
-
         <record id="account_account_graph" model="ir.ui.view">
             <field name="name">account.account.graph</field>
             <field name="model">account.account</field>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index ffd2811cba7..6417bb99d88 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -61,7 +61,7 @@
             <field name="view_id" ref="board_account_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
         <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>
 
diff --git a/addons/account/company.py b/addons/account/company.py
index 4ad4d1226d7..e961fa563e4 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -24,6 +24,7 @@ from osv import fields, osv
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
+        'expects_chart_of_accounts': fields.boolean('Expects a Chart of Accounts'),
         'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
         'overdue_msg': fields.text('Overdue Payments Message', translate=True),
         'property_reserve_and_surplus_account': fields.property(
@@ -37,6 +38,7 @@ class res_company(osv.osv):
     }
 
     _defaults = {
+        'expects_chart_of_accounts': True,
         'overdue_msg': '''Our records indicate that the following payments are still due. If the amount
 has already been paid, please disregard this notice. However, if you have any
 queries regarding your account, please contact us.
diff --git a/addons/account/demo/account_invoice_demo.xml b/addons/account/demo/account_invoice_demo.xml
index 184b349be71..44e22ce4681 100644
--- a/addons/account/demo/account_invoice_demo.xml
+++ b/addons/account/demo/account_invoice_demo.xml
@@ -6,9 +6,7 @@
 			<field name="payment_term" ref="account.account_payment_term"/>
 			<field name="journal_id" ref="account.expenses_journal"/>
 			<field name="currency_id" ref="base.EUR"/>
-			<field name="address_invoice_id" ref="base.res_partner_address_wong"/>
 			<field name="user_id" ref="base.user_demo"/>
-			<field name="address_contact_id" ref="base.res_partner_address_wong"/>
 			<field name="reference_type">none</field>
 			<field name="company_id" ref="base.main_company"/>
 			<field name="state">draft</field>
diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py
index d36e9163ba9..cada93e75e0 100644
--- a/addons/account/edi/invoice.py
+++ b/addons/account/edi/invoice.py
@@ -75,7 +75,7 @@ class account_invoice(osv.osv, EDIMixin):
         """Exports a supplier or customer invoice"""
         edi_struct = dict(edi_struct or INVOICE_EDI_STRUCT)
         res_company = self.pool.get('res.company')
-        res_partner_address = self.pool.get('res.partner.address')
+        res_partner = self.pool.get('res.partner')
         edi_doc_list = []
         for invoice in records:
             # generate the main report
@@ -84,8 +84,7 @@ class account_invoice(osv.osv, EDIMixin):
             edi_doc.update({
                     'company_address': res_company.edi_export_address(cr, uid, invoice.company_id, context=context),
                     'company_paypal_account': invoice.company_id.paypal_account,
-                    'partner_address': res_partner_address.edi_export(cr, uid, [invoice.address_invoice_id], context=context)[0],
-
+                    'partner_address': res_partner.edi_export(cr, uid, [invoice.partner_id], context=context)[0],
                     'currency': self.pool.get('res.currency').edi_export(cr, uid, [invoice.currency_id], context=context)[0],
                     'partner_ref': invoice.reference or False,
             })
@@ -125,34 +124,32 @@ class account_invoice(osv.osv, EDIMixin):
         #       the desired company among the user's allowed companies
 
         self._edi_requires_attributes(('company_id','company_address','type'), edi_document)
-        res_partner_address = self.pool.get('res.partner.address')
         res_partner = self.pool.get('res.partner')
 
-        # imported company = new partner
         src_company_id, src_company_name = edi_document.pop('company_id')
-        partner_id = self.edi_import_relation(cr, uid, 'res.partner', src_company_name,
-                                              src_company_id, context=context)
+
         invoice_type = edi_document['type']
         partner_value = {}
         if invoice_type in ('out_invoice', 'out_refund'):
             partner_value.update({'customer': True})
         if invoice_type in ('in_invoice', 'in_refund'):
             partner_value.update({'supplier': True})
-        res_partner.write(cr, uid, [partner_id], partner_value, context=context)
 
         # imported company_address = new partner address
         address_info = edi_document.pop('company_address')
-        address_info['partner_id'] = (src_company_id, src_company_name)
+        if 'name' not in address_info:
+            address_info['name'] = src_company_name
         address_info['type'] = 'invoice'
-        address_id = res_partner_address.edi_import(cr, uid, address_info, context=context)
+        address_info.update(partner_value)
+        address_id = res_partner.edi_import(cr, uid, address_info, context=context)
 
         # modify edi_document to refer to new partner
-        partner_address = res_partner_address.browse(cr, uid, address_id, context=context)
-        edi_document['partner_id'] = (src_company_id, src_company_name)
+        partner_address = res_partner.browse(cr, uid, address_id, context=context)
+        address_edi_m2o = self.edi_m2o(cr, uid, partner_address, context=context)
+        edi_document['partner_id'] = address_edi_m2o
         edi_document.pop('partner_address', False) # ignored
-        edi_document['address_invoice_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
 
-        return partner_id
+        return address_id
 
 
     def edi_import(self, cr, uid, edi_document, context=None):
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 0904ec6fd54..ce837c6662b 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -23,7 +23,7 @@
             <field name="context">{'search_default_model_id':'account.invoice'}</field>
             <field name="context" eval="{'search_default_model_id': ref('account.model_account_invoice')}"/>
         </record>
-        <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30"/>
+        <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30" groups="base.group_no_one"/>
 
     </data>
 
@@ -40,14 +40,14 @@
             <field name="name">Automated Invoice Notification Mail</field>
             <field name="email_from">${object.user_id.user_email or object.company_id.email or 'noreply@localhost'}</field>
             <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
-            <field name="email_to">${object.address_invoice_id.email or ''}</field>
+            <field name="email_to">${object.partner_id.email or ''}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
 
-    <p>Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''},</p>
-    
+    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
+
     <p>A new invoice is available for ${object.partner_id.name}: </p>
     
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
@@ -124,7 +124,7 @@
 </div>
             ]]></field>
             <field name="body_text"><![CDATA[
-Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''},
+Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
 A new invoice is available for ${object.partner_id.name}:
        | Invoice number: *${object.number}*
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 9a543cc2ead..8a00a8887c3 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.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-03-18 19:30+0000\n"
-"Last-Translator: Tryfon Farmakakis <farmakakistryfon@gmail.com>\n"
+"PO-Revision-Date: 2012-03-21 21:33+0000\n"
+"Last-Translator: Christos Ververidis <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-19 04:40+0000\n"
-"X-Generator: Launchpad (build 14969)\n"
+"X-Launchpad-Export-Date: 2012-03-22 04:57+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -145,7 +145,7 @@ msgstr "Συμφωνία"
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
 msgid "Reference"
-msgstr "Παραπομπή"
+msgstr "Παραπομπές"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index ae43e0a54d2..6b88c60792c 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-21 04:07+0000\n"
+"PO-Revision-Date: 2012-03-27 01:25+0000\n"
 "Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n"
-"X-Generator: Launchpad (build 14838)\n"
+"X-Launchpad-Export-Date: 2012-03-28 04:45+0000\n"
+"X-Generator: Launchpad (build 15027)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -6492,7 +6492,7 @@ msgstr "当前期间凭证列表"
 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 "请勾选这，如果您允许作废此账簿的分录或发票。"
+msgstr "勾选这里，则此凭证簿下的亏即凭证或发票可以被作废。"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6736,7 +6736,7 @@ msgstr "此报表用于生成一个试算平衡表的PDF报表。这样你可以
 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 "勾选这里，如果您不肯定账簿的分录，您可以把它标注为“待审核”状态交由会计师来确定。"
+msgstr "勾选这里，如果您不确定凭证是否正确，您可以把它标注为“待审核”状态交由会计师来确定。"
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
@@ -6986,7 +6986,7 @@ msgstr "税模板"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr "您确定要打开账簿的分录吗？"
+msgstr "你确定要显示这个凭证簿的会计凭证么？"
 
 #. module: account
 #: view:account.state.open:0
@@ -8830,7 +8830,8 @@ msgid ""
 "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
diff --git a/addons/account/ir_sequence.py b/addons/account/ir_sequence.py
index 5c9039e43c3..a98b7e87d77 100644
--- a/addons/account/ir_sequence.py
+++ b/addons/account/ir_sequence.py
@@ -48,6 +48,8 @@ class ir_sequence(osv.osv):
     }
 
     def _next(self, cr, uid, seq_ids, context=None):
+        if context is None:
+            context = {}
         for seq in self.browse(cr, uid, seq_ids, context):
             for line in seq.fiscal_ids:
                 if line.fiscalyear_id.id == context.get('fiscalyear_id'):
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 706fa4683cb..c97024977ed 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -96,7 +96,7 @@
                         <separator string="Supplier Debit" colspan="2"/>
                         <field name="debit"/>
                     </group>
-                    <field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1">
+                    <field colspan="4" name="bank_ids" nolabel="1">
                         <form string="Bank account">
                             <field name="state"/>
                             <newline/>
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 2661e67cd50..ec89d280774 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -103,7 +103,6 @@
             <field name="type">normal</field>
             <field name="state">open</field>
             <field name="partner_id" ref="base.res_partner_seagate"/>
-            <field name="contact_id" ref="base.res_partner_address_seagate"/>
         </record>
         <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
@@ -112,7 +111,6 @@
             <field name="parent_id" ref="analytic_integration"/>
             <field name="state">open</field>
             <field name="partner_id" ref="base.res_partner_seagate"/>
-            <field name="contact_id" ref="base.res_partner_address_seagate"/>
         </record>
         <record id="analytic_magasin_bml_1" model="account.analytic.account">
             <field name="name">Magasin BML 1</field>
@@ -120,7 +118,6 @@
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_15"/>
-            <field name="contact_id" ref="base.res_partner_address_14"/>
         </record>
         <record id="analytic_integration_c2c" model="account.analytic.account">
             <field name="name">CampToCamp</field>
@@ -130,7 +127,6 @@
             <field eval="time.strftime('%Y-12-31')" name="date"/>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="partner_id" ref="base.res_partner_c2c"/>
-            <field name="contact_id" ref="base.res_partner_address_Camptocamp"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_agrolait" model="account.analytic.account">
@@ -139,7 +135,6 @@
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
-            <field name="contact_id" ref="base.res_partner_address_8"/>
         </record>
         <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
@@ -147,7 +142,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
-            <field name="contact_id" ref="base.res_partner_address_tang"/>
         </record>
         <record id="analytic_distripc" model="account.analytic.account">
             <field name="name">DistriPC</field>
@@ -155,7 +149,6 @@
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
-            <field name="contact_id" ref="base.res_partner_address_7"/>
         </record>
         <record id="analytic_sednacom" model="account.analytic.account">
             <field name="name">Sednacom</field>
@@ -165,7 +158,6 @@
             <field name="parent_id" ref="analytic_partners"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_sednacom"/>
-            <field name="contact_id" ref="base.res_partner_address_11"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_thymbra" model="account.analytic.account">
@@ -176,7 +168,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_thymbra"/>
-            <field name="contact_id" ref="base.res_partner_address_thymbra"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_leclerc" model="account.analytic.account">
@@ -187,7 +178,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_11"/>
-            <field name="contact_id" ref="base.res_partner_address_15"/>
         </record>
         <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
             <field name="name">Desertic - Hispafuentes</field>
@@ -197,7 +187,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
-            <field name="contact_id" ref="base.res_partner_address_3000"/>
         </record>
         <record id="analytic_tiny_at_work" model="account.analytic.account">
             <field name="name">OpenERP SA AT Work</field>
@@ -205,7 +194,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
-            <field name="contact_id" ref="base.res_partner_address_tinyatwork"/>
         </record>
         <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="name">Camp to Camp</field>
@@ -215,7 +203,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_c2c"/>
-            <field name="contact_id" ref="base.res_partner_address_Camptocamp"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_project_2_support" model="account.analytic.account">
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 9f9aca2c8fb..328cedb9bc1 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -92,8 +92,7 @@
                         <page string="Account Data">
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Contacts"/>
-                                <field name="partner_id" on_change="on_change_partner_id(partner_id)"/>
-                                <field name="contact_id"/>
+                                <field name="partner_id"/>
                                 <field name="user_id"/>
                             </group>
                             <group colspan="2" col="2" name="contract">
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 839c9b13043..2fbe641dba3 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -65,8 +65,6 @@ class account_invoice_report(osv.osv):
             ('cancel','Cancelled')
             ], 'Invoice State', readonly=True),
         'date_due': fields.date('Due Date', readonly=True),
-        'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
-        'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
         'account_id': fields.many2one('account.account', 'Account',readonly=True),
         'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
@@ -103,8 +101,6 @@ class account_invoice_report(osv.osv):
                     ai.state,
                     pt.categ_id,
                     ai.date_due as date_due,
-                    ai.address_contact_id as address_contact_id,
-                    ai.address_invoice_id as address_invoice_id,
                     ai.account_id as account_id,
                     ail.account_id as account_line_id,
                     ai.partner_bank_id as partner_bank_id,
@@ -186,8 +182,6 @@ class account_invoice_report(osv.osv):
                     ai.state,
                     pt.categ_id,
                     ai.date_due,
-                    ai.address_contact_id,
-                    ai.address_invoice_id,
                     ai.account_id,
                     ail.account_id,
                     ai.partner_bank_id,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index cd43f416fce..6e5f83a83d1 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -22,8 +22,6 @@
                 <field name="period_id" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
                 <field name="journal_id" invisible="1"/>
-                <field name="address_contact_id" invisible="1"/>
-                <field name="address_invoice_id" invisible="1"/>
                 <field name="partner_bank_id" invisible="1"/>
                 <field name="date_due" invisible="1"/>
                 <field name="account_id" invisible="1"/>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 36228942a31..bb142587de0 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -162,13 +162,13 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id,'invoice') ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -210,7 +210,7 @@
           <para style="terp_default_Centre_9">[[ o.origin or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
+          <para style="terp_default_Centre_9">[[ (o.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py
index 0a03801d409..46fcd9af626 100644
--- a/addons/account/report/account_print_overdue.py
+++ b/addons/account/report/account_print_overdue.py
@@ -38,7 +38,6 @@ class Overdue(report_sxw.rml_parse):
     def _adr_get(self, partner, type):
         res = []
         res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
-        res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
         addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
         adr_id = addresses and addresses[type] or False
         result = {
@@ -51,7 +50,7 @@ class Overdue(report_sxw.rml_parse):
                   'country_id': False,
                  }
         if adr_id:
-            result = res_partner_address.read(self.cr, self.uid, [adr_id], context=self.context.copy())
+            result = res_partner.read(self.cr, self.uid, [adr_id], context=self.context.copy())
             result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False
             result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False
             return result
@@ -62,7 +61,6 @@ class Overdue(report_sxw.rml_parse):
     def _tel_get(self,partner):
         if not partner:
             return False
-        res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
         res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
         addresses = res_partner.address_get(self.cr, self.uid, [partner.id], ['invoice'])
         adr_id = addresses and addresses['invoice'] or False
@@ -70,7 +68,7 @@ class Overdue(report_sxw.rml_parse):
             adr=res_partner_address.read(self.cr, self.uid, [adr_id])[0]
             return adr['phone']
         else:
-            return partner.address and partner.address[0].phone or False
+            return partner.phone or False
         return False
 
     def _lines_get(self, partner):
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
new file mode 100644
index 00000000000..ebdf84be35e
--- /dev/null
+++ b/addons/account/res_config.py
@@ -0,0 +1,282 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import datetime
+from dateutil.relativedelta import relativedelta
+from operator import itemgetter
+from os.path import join as opj
+
+from tools.translate import _
+from osv import osv, fields
+import tools
+
+class account_config_settings(osv.osv_memory):
+    _name = 'account.config.settings'
+    _inherit = 'res.config.settings'
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'has_default_company': fields.boolean('Has default company', readonly=True),
+
+        'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean',
+            string='Chart of Accounts for this Company'),
+        'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
+            string='Main currency', help="Main currency of the company."),
+        'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
+            string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.)"),
+        'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
+            string='Bank Accounts on Reports', help="Bank accounts as printed on footer of reports."),
+
+        'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
+        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
+        'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"),
+        'seq_journal': fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
+        'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
+        'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
+        'sale_tax_rate': fields.float('Sales Tax (%)'),
+        'purchase_tax_rate': fields.float('Purchase Tax (%)'),
+        'complete_tax_set': fields.boolean('Complete Set of Taxes', help='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'),
+
+        'has_fiscal_year': fields.boolean('Company has a fiscal year'),
+        'date_start': fields.date('Start Date', required=True),
+        'date_stop': fields.date('End Date', required=True),
+        'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
+
+        'sale_journal_id': fields.many2one('account.journal', 'Sale Journal'),
+        'sale_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', string='Invoice Sequence'),
+        'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Invoice Number'),
+        'sale_refund_journal_id': fields.many2one('account.journal', 'Sale Refund Journal'),
+        'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Refund Sequence'),
+        'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Refund Number'),
+        'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'),
+        'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Invoice Sequence'),
+        'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Invoice Number'),
+        'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase Refund Journal'),
+        'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Refund Sequence'),
+        'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Refund Number'),
+
+        'module_account_check_writing': fields.boolean('Support check writings',
+            help="""This allows you to check writing and printing.
+                This installs the module account_check_writing."""),
+        'module_account_accountant': fields.boolean('Accountant Features',
+            help="""This allows you to access all the accounting features, like the journal items and the chart of accounts.
+                This installs the module account_accountant."""),
+        'module_account_asset': fields.boolean('Assets Management',
+            help="""This allows you to manage the assets owned by a company or a person.
+                It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
+                This installs the module account_asset."""),
+        'module_account_budget': fields.boolean('Budgets Management',
+            help="""This allows accountants to manage analytic and crossovered budgets.
+                Once the master budgets and the budgets are defined,
+                the project managers can set the planned amount on each analytic account.
+                This installs the module account_budget."""),
+        'module_account_payment': fields.boolean('Supplier Payment Orders',
+            help="""This allows you to create and manage your payment orders, with purposes to
+                    * serve as base for an easy plug-in of various automated payment mechanisms, and
+                    * provide a more efficient way to manage invoice payments.
+                This installs the module account_payment."""),
+        'module_account_voucher': fields.boolean('Manage Customer Payments',
+            help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
+                This installs the module account_voucher."""),
+        'module_account_followup': fields.boolean('Customer Follow-Ups',
+            help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
+                This installs the module account_followup."""),
+        'module_account_analytic_plans': fields.boolean('Support Multiple Analytic Plans',
+            help="""This allows to use several analytic plans, according to the general journal.
+                This installs the module account_analytic_plans."""),
+        'module_account_analytic_default': fields.boolean('Rules for Analytic Assignation',
+            help="""Set default values for your analytic accounts.
+                Allows to automatically select analytic accounts based on criteria like product, partner, user, company, date.
+                This installs the module account_analytic_default."""),
+        'module_account_invoice_layout': fields.boolean('Allow notes and subtotals',
+            help="""This provides some features to improve the layout of invoices.
+                It gives you the possibility to:
+                    * order all the lines of an invoice
+                    * add titles, comment lines, sub total lines
+                    * draw horizontal lines and put page breaks.
+                This installs the module account_invoice_layout."""),
+
+        'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
+            implied_group='account.group_proforma_invoices',
+            help="Allows you to put invoices in pro-forma state."),
+
+        'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'),
+        'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'),
+    }
+
+    def _default_company(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return user.company_id.id
+
+    def _default_has_default_company(self, cr, uid, context=None):
+        count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
+        return bool(count == 1)
+
+    _defaults = {
+        'company_id': _default_company,
+        'has_default_company': _default_has_default_company,
+        'seq_journal': True,
+        'date_start': lambda *a: time.strftime('%Y-01-01'),
+        'date_stop': lambda *a: time.strftime('%Y-12-31'),
+        'period': 'month',
+    }
+
+    def create(self, cr, uid, values, context=None):
+        id = super(account_config_settings, self).create(cr, uid, values, context)
+        # Hack: to avoid some nasty bug, related fields are not written upon record creation.
+        # Hence we write on those fields here.
+        vals = {}
+        for fname, field in self._columns.iteritems():
+            if isinstance(field, fields.related) and fname in values:
+                vals[fname] = values[fname]
+        self.write(cr, uid, [id], vals, context)
+        return id
+
+    def onchange_company_id(self, cr, uid, ids, company_id):
+        # update related fields
+        company = self.pool.get('res.company').browse(cr, uid, company_id)
+        has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
+        fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
+            [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
+             ('company_id', '=', company_id)])
+        values = {
+            'expects_chart_of_accounts': company.expects_chart_of_accounts,
+            'currency_id': company.currency_id.id,
+            'paypal_account': company.paypal_account,
+            'company_footer': company.rml_footer2,
+            'has_chart_of_accounts': has_chart_of_accounts,
+            'has_fiscal_year': bool(fiscalyear_count),
+            'chart_template_id': False,
+        }
+        # update journals and sequences
+        for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+            for suffix in ('_journal_id', '_sequence_prefix', '_sequence_next'):
+                values[journal_type + suffix] = False
+        journal_obj = self.pool.get('account.journal')
+        journal_ids = journal_obj.search(cr, uid, [('company_id', '=', company_id)])
+        for journal in journal_obj.browse(cr, uid, journal_ids):
+            if journal.type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+                values.update({
+                    journal.type + '_journal_id': journal.id,
+                    journal.type + '_sequence_prefix': journal.sequence_id.prefix,
+                    journal.type + '_sequence_next': journal.sequence_id.number_next,
+                })
+        # update taxes
+        ir_values = self.pool.get('ir.values')
+        taxes_id = ir_values.get_default(cr, uid, 'product.product', 'taxes_id', company_id=company_id)
+        supplier_taxes_id = ir_values.get_default(cr, uid, 'product.product', 'supplier_taxes_id', company_id=company_id)
+        values.update({
+            'default_sale_tax': isinstance(taxes_id, list) and taxes_id[0] or taxes_id,
+            'default_purchase_tax': isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id,
+        })
+        return {'value': values}
+
+    def onchange_chart_template_id(self, cr, uid, ids, chart_template_id, context=None):
+        tax_templ_obj = self.pool.get('account.tax.template')
+        res = {'value': {
+            'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False,
+            'sale_tax_rate': 15, 'purchase_tax_rate': 15,
+        }}
+        if chart_template_id:
+            # update complete_tax_set, sale_tax and purchase_tax
+            chart_template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
+            res['value'].update({'complete_tax_set': chart_template.complete_tax_set})
+            if chart_template.complete_tax_set:
+                # default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
+                sale_tax_ids = tax_templ_obj.search(cr, uid,
+                    [("chart_template_id", "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))],
+                    order="sequence, id desc")
+                purchase_tax_ids = tax_templ_obj.search(cr, uid,
+                    [("chart_template_id", "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))],
+                    order="sequence, id desc")
+                res['value']['sale_tax'] = sale_tax_ids and sale_tax_ids[0] or False
+                res['value']['purchase_tax'] = purchase_tax_ids and purchase_tax_ids[0] or False
+            if chart_template.code_digits:
+                res['value']['code_digits'] = chart_template.code_digits
+        return res
+
+    def onchange_tax_rate(self, cr, uid, ids, rate, context=None):
+        return {'value': {'purchase_tax_rate': rate or False}}
+
+    def onchange_start_date(self, cr, uid, id, start_date):
+        if start_date:
+            start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d")
+            end_date = (start_date + relativedelta(months=12)) - relativedelta(days=1)
+            return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
+        return {}
+
+    def set_default_taxes(self, cr, uid, ids, context=None):
+        """ set default sale and purchase taxes for products """
+        ir_values = self.pool.get('ir.values')
+        config = self.browse(cr, uid, ids[0], context)
+        ir_values.set_default(cr, uid, 'product.product', 'taxes_id',
+            config.default_sale_tax and [config.default_sale_tax.id] or False, company_id=config.company_id.id)
+        ir_values.set_default(cr, uid, 'product.product', 'supplier_taxes_id',
+            config.default_purchase_tax and [config.default_purchase_tax.id] or False, company_id=config.company_id.id)
+
+    def set_chart_of_accounts(self, cr, uid, ids, context=None):
+        """ install a chart of accounts for the given company (if required) """
+        config = self.browse(cr, uid, ids[0], context)
+        if config.chart_template_id:
+            assert config.expects_chart_of_accounts and not config.has_chart_of_accounts
+            wizard = self.pool.get('wizard.multi.charts.accounts')
+            wizard_id = wizard.create(cr, uid, {
+                'company_id': config.company_id.id,
+                'chart_template_id': config.chart_template_id.id,
+                'code_digits': config.code_digits or 6,
+                'seq_journal': config.seq_journal,
+                'sale_tax': config.sale_tax.id,
+                'purchase_tax': config.purchase_tax.id,
+                'sale_tax_rate': config.sale_tax_rate,
+                'purchase_tax_rate': config.purchase_tax_rate,
+                'complete_tax_set': config.complete_tax_set,
+            }, context)
+            wizard.execute(cr, uid, [wizard_id], context)
+
+    def set_fiscalyear(self, cr, uid, ids, context=None):
+        """ create a fiscal year for the given company (if necessary) """
+        config = self.browse(cr, uid, ids[0], context)
+        if config.has_chart_of_accounts or config.chart_template_id:
+            fiscalyear = self.pool.get('account.fiscalyear')
+            fiscalyear_count = fiscalyear.search_count(cr, uid,
+                [('date_start', '<=', config.date_start), ('date_stop', '>=', config.date_stop),
+                 ('company_id', '=', config.company_id.id)],
+                context=context)
+            if not fiscalyear_count:
+                name = code = config.date_start[:4]
+                if int(name) != int(config.date_stop[:4]):
+                    name = config.date_start[:4] +'-'+ config.date_stop[:4]
+                    code = config.date_start[2:4] +'-'+ config.date_stop[2:4]
+                vals = {
+                    'name': name,
+                    'code': code,
+                    'date_start': config.date_start,
+                    'date_stop': config.date_stop,
+                    'company_id': config.company_id.id,
+                }
+                fiscalyear_id = fiscalyear.create(cr, uid, vals, context=context)
+                if config.period == 'month':
+                    fiscalyear.create_period(cr, uid, [fiscalyear_id])
+                elif config.period == '3months':
+                    fiscalyear.create_period3(cr, uid, [fiscalyear_id])
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
new file mode 100644
index 00000000000..80517d44f88
--- /dev/null
+++ b/addons/account/res_config_view.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="open_account_charts_modules" model="ir.actions.act_window">
+            <field name="name">Chart Templates</field>
+            <field name="res_model">ir.module.module</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization_account_charts')}"/>
+            <field name="search_view_id" ref="base.view_module_filter"/>
+        </record>
+
+        <record id="view_account_config_settings" model="ir.ui.view">
+            <field name="name">account settings</field>
+            <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"/>
+
+                    <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>
+
+                    <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">
+                        <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"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_config" model="ir.actions.act_window">
+            <field name="name">Configure Accounting</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.config.settings</field>
+            <field name="view_mode">form</field>
+        </record>
+
+        <menuitem id="menu_account_config" name="Accounting" parent="base.menu_config"
+            sequence="6" action="action_account_config"/>
+
+    </data>
+</openerp>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 64498127dc5..e1a29a6edfb 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -4,18 +4,24 @@
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Invoicing &amp; Payments</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
-    <record id="group_account_user" model="res.groups" context="{'noadmin':True}">
+    <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
-    <record id="group_account_manager" model="res.groups" context="{'noadmin':True}">
+    <record id="group_account_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
 
+    <record id="group_proforma_invoices" model="res.groups">
+        <field name="name">Pro-forma Invoices</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
         <field ref="model_account_move" name="model_id"/>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index d1cb87bd434..a5049c0a345 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -88,9 +88,7 @@ access_account_invoice_tax_accountant,account.invoice.tax accountant,model_accou
 access_account_move_reconcile_manager,account.move.reconcile manager,model_account_move_reconcile,account.group_account_manager,1,0,0,0

 access_account_analytic_line_invoice,account.analytic.line invoice,model_account_analytic_line,account.group_account_invoice,1,1,1,1

 access_account_invoice_line_accountant,account.invoice.line accountant,model_account_invoice_line,account.group_account_user,1,0,0,0

-access_res_partner_address_accountant,res.partner.address accountant,base.model_res_partner_address,account.group_account_user,1,0,0,0

 access_account_account_invoice,account.account invoice,model_account_account,account.group_account_invoice,1,1,1,1

-access_res_partner_address_invoice,res.partner.address invoice,base.model_res_partner_address,account.group_account_invoice,1,1,1,1

 access_account_analytic_accountant,account.analytic.account accountant,analytic.model_account_analytic_account,account.group_account_user,1,1,1,1

 access_account_account_type_invoice,account.account.type invoice,model_account_account_type,account.group_account_invoice,1,1,1,1

 access_report_account_receivable_invoice,report.account.receivable.invoice,model_report_account_receivable,account.group_account_invoice,1,1,1,1

diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml
index 5ec7405d719..dbbe3d5f676 100644
--- a/addons/account/test/account_change_currency.yml
+++ b/addons/account/test/account_change_currency.yml
@@ -3,8 +3,6 @@
 -
   !record {model: account.invoice, id: account_invoice_currency}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.EUR
     invoice_line:
diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml
index b9818b71d2f..0825c3d2433 100644
--- a/addons/account/test/account_invoice_state.yml
+++ b/addons/account/test/account_invoice_state.yml
@@ -3,8 +3,6 @@
 -
   !record {model: account.invoice, id: account_invoice_state}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.EUR
     invoice_line:
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 6a4d04daa70..7ce1843bfa3 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -4,13 +4,11 @@
   !record {model: account.invoice, id: test_invoice_1}:
     currency_id: base.EUR
     company_id: base.main_company
-    address_invoice_id: base.res_partner_address_tang
     partner_id: base.res_partner_asus
     state: draft
     type: out_invoice
     account_id: account.a_recv
     name: Test invoice 1
-    address_contact_id: base.res_partner_address_tang
 -
   In order to test the PDF reports defined on an invoice, we will print an Invoice Report
 -
diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml
index 4748175c118..12146aeac97 100644
--- a/addons/account/test/account_sequence_test.yml
+++ b/addons/account/test/account_sequence_test.yml
@@ -16,8 +16,6 @@
 - I create a draft customer invoice in a period of the demo fiscal year
 - !record {model: account.invoice, id: invoice_seq_test}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_zen
-    address_invoice_id: base.res_partner_address_zen
     company_id: base.main_company
     currency_id: base.EUR
     invoice_line:
diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml
index 3683a3e44c9..a8898bc9764 100644
--- a/addons/account/test/account_supplier_invoice.yml
+++ b/addons/account/test/account_supplier_invoice.yml
@@ -23,8 +23,6 @@
 -
   !record {model: account.invoice, id: account_invoice_supplier0}:
     account_id: account.a_pay
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     check_total: 3000.0
     company_id: base.main_company
     currency_id: base.EUR
diff --git a/addons/account/test/price_accuracy00.yml b/addons/account/test/price_accuracy00.yml
index 135dcf1ec60..639b39b6c25 100644
--- a/addons/account/test/price_accuracy00.yml
+++ b/addons/account/test/price_accuracy00.yml
@@ -21,7 +21,6 @@
         name: Precision Test
         type: out_invoice
         partner_id: base.res_partner_2
-        address_invoice_id: base.res_partner_address_1
         account_id: account.a_recv
         date_invoice: !eval time.strftime('%Y-%m-%d')
         invoice_line:
diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml
index c36672c4531..9460bbcf085 100644
--- a/addons/account/test/test_edi_invoice.yml
+++ b/addons/account/test/test_edi_invoice.yml
@@ -7,7 +7,6 @@
     journal_id: 1
     partner_id: base.res_partner_agrolait
     currency_id: base.EUR
-    address_invoice_id: base.res_partner_address_8invoice
     company_id: 1
     account_id: account.a_pay
     date_invoice: !eval "'%s' % (time.strftime('%Y-%m-%d'))"
@@ -58,11 +57,12 @@
         "company_address": {
                 "__id": "base:b22acf7a-ddcd-11e0-a4db-701a04e25543.main_address",
                 "__module": "base",
-                "__model": "res.partner.address",
-                "city": "Gerompont",
-                "zip": "1367",
-                "country_id": ["base:b22acf7a-ddcd-11e0-a4db-701a04e25543.be", "Belgium"],
-                "phone": "(+32).81.81.37.00",
+                "__model": "res.partner", 
+                "city": "Gerompont", 
+                "name": "Company main address",
+                "zip": "1367", 
+                "country_id": ["base:b22acf7a-ddcd-11e0-a4db-701a04e25543.be", "Belgium"], 
+                "phone": "(+32).81.81.37.00", 
                 "street": "Chaussee de Namur 40",
                 "bank_ids": [
                     ["base:b22acf7a-ddcd-11e0-a4db-701a04e25543.res_partner_bank-ZrTWzesfsdDJzGbp","Sample bank: 123465789-156113"]
@@ -80,12 +80,13 @@
         "partner_address": {
                 "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_address_7wdsjasdjh",
                 "__module": "base",
-                "__model": "res.partner.address",
-                "phone": "(+32).81.81.37.00",
-                "street": "Chaussee de Namur 40",
-                "city": "Gerompont",
-                "zip": "1367",
-                "country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"],
+                "__model": "res.partner",
+                "name": "Default Address",
+                "phone": "(+32).81.81.37.00", 
+                "street": "Chaussee de Namur 40", 
+                "city": "Gerompont", 
+                "zip": "1367", 
+                "country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"], 
         },
         "date_invoice": time.strftime('%Y-%m-%d'),
         "name": "sample invoice",
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index ec74320e135..6cba6ffa826 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -176,7 +176,6 @@ class account_invoice_refund(osv.osv_memory):
                         invoice = inv_obj.read(cr, uid, [inv.id],
                                     ['name', 'type', 'number', 'reference',
                                     'comment', 'date_due', 'partner_id',
-                                    'address_contact_id', 'address_invoice_id',
                                     'partner_insite', 'partner_contact',
                                     'partner_ref', 'payment_term', 'account_id',
                                     'currency_id', 'invoice_line', 'tax_line',
@@ -197,8 +196,8 @@ class account_invoice_refund(osv.osv_memory):
                             'period_id': period,
                             'name': description
                         })
-                        for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
-                                'account_id', 'currency_id', 'payment_term', 'journal_id'):
+                        for field in ('partner_id', 'account_id', 'currency_id',
+                                         'payment_term', 'journal_id'):
                                 invoice[field] = invoice[field] and invoice[field][0]
                         inv_id = inv_obj.create(cr, uid, invoice, {})
                         if inv.payment_term.id:
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 50c5d4adbae..79cfa7236b6 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -123,6 +123,7 @@ class account_common_report(osv.osv_memory):
 
     _defaults = {
             'fiscalyear_id': _get_fiscalyear,
+            'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.common.report',context=c),
             'journal_ids': _get_all_journal,
             'filter': 'filter_no',
             'chart_account_id': _get_account,
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 86f437ae8bd..964383246dd 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -3,7 +3,7 @@
         <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
-            <field name="name">All Uninvoiced Entries</field>
+            <field name="name">Time &amp; Costs to Invoice</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -11,7 +11,7 @@
             <field name="context">{'search_default_to_invoice': 1}</field>
             <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
         </record>
-        <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced"/>
+        <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced" sequence="5"/>
 
         <record id="view_account_analytic_account_overdue_search" model="ir.ui.view">
             <field name="name">account.analytic.account.search</field>
@@ -81,7 +81,7 @@
         <menuitem id="base.menu_sales" name="Sales"
             parent="base.menu_base_partner"
             sequence="1"/>
-        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="50" parent="base.menu_sales"/>
+        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/>
 
 
     </data>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index bbbbb5c491f..3391e9ea2fd 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -111,19 +111,5 @@
             </field>
         </record>
 
-        <record id="view_contract_installation" model="ir.ui.view">
-            <field name="name">Sales Application</field>
-            <field name="model">sale.config.settings</field>
-            <field name="inherit_id" ref="sale.view_sales_config"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <group name="config_contracts" position="inside">
-                    <separator string="Contracts" colspan="4"/>
-                    <field name="module_analytic_user_function"/>
-                    <field name="module_analytic_journal_billing_rate"/>
-                </group>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/account_analytic_analysis/cron_account_analytic_account.py b/addons/account_analytic_analysis/cron_account_analytic_account.py
index df022cbd6bd..caa9067b227 100644
--- a/addons/account_analytic_analysis/cron_account_analytic_account.py
+++ b/addons/account_analytic_analysis/cron_account_analytic_account.py
@@ -32,9 +32,7 @@ Here is the list of contracts to renew:
       % endif
       - Dates: ${account.date_start} to ${account.date and account.date or '???'}
       - Contacts:
-        % for address in account.partner_id.address:
-        . ${address.name}, ${address.phone}, ${address.email}
-        % endfor
+        ${account.partner_id.name}, ${account.partner_id.phone}, ${account.partner_id.email}
 
   % endfor
 % endfor
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 2c4fdd4e421..0f868f91d34 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -73,8 +73,8 @@ class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
     _description = "Invoice Line"
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
-        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context, company_id=company_id)
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
+        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id=currency_id, context=context, company_id=company_id)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
         if rec:
             res_prod['value'].update({'account_analytic_id': rec.analytic_id.id})
@@ -89,8 +89,8 @@ class stock_picking(osv.osv):
     _inherit = "stock.picking"
 
     def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
-        partner_id = picking.address_id and picking.address_id.partner_id or False
-        rec = self.pool.get('account.analytic.default').account_get(cursor, user, move_line.product_id.id, partner_id and partner_id.id, user, time.strftime('%Y-%m-%d'), context={})
+        partner_id = picking.partner_id and picking.partner_id.id or False
+        rec = self.pool.get('account.analytic.default').account_get(cursor, user, move_line.product_id.id, partner_id , user, time.strftime('%Y-%m-%d'), context={})
 
         if rec:
             return rec.analytic_id.id
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 82739587d4e..1669bd277d3 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -71,7 +71,6 @@ of distribution models.
         'account_analytic_plans_report.xml',
         'wizard/analytic_plan_create_model_view.xml',
         'wizard/account_crossovered_analytic_view.xml',
-        'account_analytic_plans_installer_view.xml'
     ],
     'demo_xml': [],
     'test': ['test/acount_analytic_plans_report.yml'],
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index a051e994f2e..3180d0458d4 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -307,8 +307,8 @@ class account_invoice_line(osv.osv):
         res ['analytics_id'] = line.analytics_id and line.analytics_id.id or False
         return res
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
-        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context, company_id=company_id)
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
+        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context=context, company_id=company_id)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
         if rec and rec.analytics_id:
             res_prod['value'].update({'analytics_id': rec.analytics_id.id})
diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
deleted file mode 100644
index c6879774078..00000000000
--- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<openerp>
-  <data>
-
-    <record model="ir.actions.act_window" id="account_analytic_plan_form_action_installer">
-        <field name="name">Define your Analytic Plans</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">account.analytic.plan</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" eval="False"/>
-        <field name="help">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.</field>
-    </record>
-
-    <record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="account_analytic_plan_form_action_installer"/>
-        <field name="category_id" ref="account.category_accounting_configuration"/>
-        <field name="sequence">15</field>
-    </record>
-
-  </data>
-</openerp>
diff --git a/addons/account_anglo_saxon/i18n/ja.po b/addons/account_anglo_saxon/i18n/ja.po
new file mode 100644
index 00000000000..63df6b6ff2f
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/ja.po
@@ -0,0 +1,98 @@
+# 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-01 05:17+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-02 04:37+0000\n"
+"X-Generator: Launchpad (build 15032)\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 "無効なBBA構造のコミュニケーション"
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr "エラー：デフォールトのUOMと購入UOMは同じカテゴリーでなければいけません"
+
+#. 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/invoice.py b/addons/account_anglo_saxon/invoice.py
index ca86bd2bceb..693283b870b 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -136,9 +136,9 @@ class account_invoice_line(osv.osv):
                         res += diff_res
         return res
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
         fiscal_pool = self.pool.get('account.fiscal.position')
-        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context, company_id)
+        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context, company_id)
         if not product:
             return res
         if type in ('in_invoice','in_refund'):
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 8f8a017c376..1b1df80a5e8 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -288,7 +288,7 @@
         </field>
     </record>
 
-    <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance"/>
+    <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance" sequence="9"/>
     <menuitem parent="menu_finance_assets" id="menu_action_account_asset_asset_tree"
         groups="base.group_extended"
         sequence="100"
@@ -306,7 +306,7 @@
 
     <act_window id="act_entries_open" name="Entries" res_model="account.move.line" src_model="account.asset.asset" context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
 
-    <menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_accounting"/>
+    <menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_configuration" sequence="25"/>
     <record model="ir.actions.act_window" id="action_account_asset_asset_list_normal">
         <field name="name">Asset Categories</field>
         <field name="res_model">account.asset.category</field>
@@ -316,18 +316,5 @@
 
     <menuitem parent="menu_finance_config_assets" id="menu_action_account_asset_asset_list_normal" action="action_account_asset_asset_list_normal"/>
 
-    <record model="ir.actions.act_window" id="action_account_asset_asset_form_normal">
-        <field name="name">Review Asset Categories</field>
-        <field name="res_model">account.asset.category</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-    <record id="asset_category_form_view_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_account_asset_asset_form_normal"/>
-        <field name="category_id" ref="account.category_accounting_configuration"/>
-        <field name="sequence">3</field>
-    </record>
-
 </data>
 </openerp>
diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po
new file mode 100644
index 00000000000..1401cca3b71
--- /dev/null
+++ b/addons/account_asset/i18n/es_EC.po
@@ -0,0 +1,833 @@
+# Spanish (Ecuador) 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-03-24 03:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-25 05:05+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Activos en estado borrador y abierto"
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Fecha de finalización"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Valor residual"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Cuenta gastos amortización"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Calcular activo"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "Importe bruto"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "Activo Fijo"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+"Indica que el primer asiento de depreciación para este activo tiene que ser "
+"hecho desde la fecha de compra en vez de desde el 1 de enero"
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "Nombre histórico"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Compañia"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Modificar"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "En proceso"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "Importe de depreciación"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Análisis activos"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "Factor degresivo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Categorías de Activo Fijo"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+"Este asistente asentará las líneas de depreciación de los activos en "
+"ejecución que pertenezcan al periodo seleccionado"
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "Asientos"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Detalle de Depreciación"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "Es el importe que prevee tener y que no puede depreciar"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Fecha de depreciación"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Cuenta de Activo Fijo"
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Monto Contabilizado"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "Activos Fijos"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "Cuenta de Depreciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "Asiento de Depreciación"
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor erróneo en el debe o en el haber del asiento contable!"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "# de líneas de depreciación"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Depreciaciones en estado borrador"
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Fecha de Cierre"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Ref."
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr "Cuenta de activo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "Calcular Depreciación de Activos Fijos"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr "Secuencia de Depreciación"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Tiempo a Depreciar"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Fecha de compra del activo"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Calcula la depreciación en el período especificado"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Cambiar duración"
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Cuenta Analitica"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Método de cálculo"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+"Prorata temporis puede ser aplicado solo para método de tiempo \"numero de "
+"depreciaciones\""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"El método usado para calcular las fechas número de líneas de depreciación\n"
+"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
+"tiempo entre 2 depreciaciones\n"
+"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
+"depreciación no irá más allá."
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr "Valor bruto "
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr "¡Error! No puede crear activos recursivos"
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tiempo en meses entre 2 depreciaciones"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Modificar Activo Fijo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "Otra Información"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Valor de salvaguarda"
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "Categoría de Activo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "Marcar cerrado"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr "Calcular Activos Fijos"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Modificar activo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Activos en cerrados"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "Padre del activo"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Histórico del activo"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr "Activos comprados en el año actual"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Detalle de Factura"
+
+#. module: account_asset
+#: 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 ""
+"La cuenta selecionada de su diario obliga a tener una moneda secundaria. "
+"Usted debería eliminar la moneda secundaria de la cuenta o asignar una vista "
+"de multi-moneda al diario."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "Tabla de depreciación"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Asientos Contables"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr "Importe no contabilizado"
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr "Método de tiempo"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic information"
+msgstr "Información analítica"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset durations to modify"
+msgstr "Duraciones de activo para modificar"
+
+#. module: account_asset
+#: 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 ""
+"¡La fecha de su asiento no está en el periodo definido! Usted debería "
+"cambiar la fecha o borrar esta restricción del diario."
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+"Escoja el método para usar en el cálculo del importe de las líneas de "
+"depreciación\n"
+"  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
+"  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Escoja el método utilizado para calcular las fechas y número de las líneas "
+"de depreciación\n"
+"  * Número de depreciaciones: Establece el número de líneas de depreciación "
+"y el tiempo entre dos depreciaciones.\n"
+"  * Fecha fin: Seleccione el tiempo entre 2 depreciaciones y la fecha de la "
+"depreciación no irá más allá."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "Activos en depreciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "Importe de las líneas de depreciación"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "Detalle de depreciación"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "La compañía debe ser la misma para su cuenta y periodos relacionados"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "Activos hijos"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "Fecha de depreciación"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr "Activos comprados en el mes actual"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "No puede crear asientos en una cuenta de tipo vista"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Buscar categoría de activo"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "asset.depreciation.confirmation.wizard"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Cerrar Activo Fijo"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "Estado del activo"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "Nombre depreciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "General"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr "Prorata Temporis"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting information"
+msgstr "Información contable"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr "Revisar categorías de activos"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de depreciación"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Fecha de compra"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr "Disminución"
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+"Escoja el periodo para el que desea asentar automáticamente las líneas de "
+"depreciación para los activos en ejecución"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "Importe a depreciar"
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "Omitir estado borrador"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr "Fechas de depreciación"
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "importe depreciado"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Contabilizado"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+"Cuando un activo es creado, su estado es 'Borrador'.\n"
+"Si el activo es confirmado, el estado pasa a 'en ejecución' y las líneas de "
+"amortización pueden ser asentados en la contabilidad.\n"
+"Puede cerrar manualmente un activo cuando su amortización ha finalizado. Si "
+"la última línea de depreciación se asienta, el activo automáticamente pasa a "
+"este estado."
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+"Valide si desea confirmar automáticamente el activo de esta categoría cuando "
+"es creado desde una factura."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Lineal"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr "Mes-1"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "Línea de depreciación del activo"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "Categoría de activo"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr "Activos comprados en el último mes"
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "Movimientos de activos creados"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "No puede crear asientos en cuentas cerradas"
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+"Para este informe, puede tener una visión general de todas las "
+"depreciaciones. La herramienta de búsqueda también puede ser utilizada para "
+"personalizar sus informes de activos y por lo tanto adecuar este análisis a "
+"sus necesidades;"
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses"
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr "Número de depreciaciones"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr "Crear asiento"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr "Asentar líneas de depreciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr "Confirmar activo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr "Jerarquía de activos"
diff --git a/addons/account_bank_statement_extensions/i18n/it.po b/addons/account_bank_statement_extensions/i18n/it.po
new file mode 100644
index 00000000000..385192db3e1
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/it.po
@@ -0,0 +1,374 @@
+# Italian 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-03-30 19:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-31 05:09+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Cerca transazioni bancarie"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confermato"
+
+#. 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 "Codice Genitore"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debito"
+
+#. 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 "Ragguppa per..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Stato"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Bozza"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Dichiarazione"
+
+#. 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 "Cancella linee"
+
+#. 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 "Conferma linee"
+
+#. 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 "Registro"
+
+#. 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 "Transazioni"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Attenzione"
+
+#. 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 "Data"
+
+#. 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_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 9ea8c819984..43b936951e8 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -46,7 +46,7 @@
             <field name="search_view_id" ref="view_budget_post_search"/>
         </record>
         <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="6"/>
-        <menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="20"/>
+        <menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="50"/>
         <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_pos" sequence="20"/>
 
 
diff --git a/addons/account_cancel/i18n/ja.po b/addons/account_cancel/i18n/ja.po
new file mode 100644
index 00000000000..651b13d5eaa
--- /dev/null
+++ b/addons/account_cancel/i18n/ja.po
@@ -0,0 +1,23 @@
+# 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-03-31 18:46+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-01 04:38+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: account_cancel
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr "キャンセル"
diff --git a/addons/account_chart/i18n/ja.po b/addons/account_chart/i18n/ja.po
new file mode 100644
index 00000000000..1a2c9e63d04
--- /dev/null
+++ b/addons/account_chart/i18n/ja.po
@@ -0,0 +1,28 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-03-31 18:48+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-01 04:38+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "最小限の勘定科目を削除してください"
+
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr "勘定科目"
diff --git a/addons/account_check_writing/report/check_print_bottom.rml b/addons/account_check_writing/report/check_print_bottom.rml
index 231edb65547..bb499a8aac1 100644
--- a/addons/account_check_writing/report/check_print_bottom.rml
+++ b/addons/account_check_writing/report/check_print_bottom.rml
@@ -169,7 +169,7 @@
           </para>
         </td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <blockTable colWidths="568.0" style="Table3">
       <tr>
         <td>
@@ -245,7 +245,7 @@
     </blockTable>
     <para style="P2">
       <font color="white"> </font>
-    </para>    
+    </para>
     <blockTable colWidths="568.0"  style="Table1">
       <tr>
         <td>
@@ -259,7 +259,7 @@
               <td>
                 <para style="P9">[[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
               </td>
-            </tr>          
+            </tr>
             <tr>
               <td>
                 <para style="P9"></para>
@@ -281,10 +281,10 @@
               </td>
               <td>
                 <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street or removeParentNode('para') ]]</para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id.address) ]] </para>
-                <para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>                
+                <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
+                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
+                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
+                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
               </td>
             </tr>
           </blockTable>
@@ -295,7 +295,7 @@
               </td>
             </tr>
           </blockTable>
-          
+
           <blockTable colWidths="25.0,500" style="Table12">
             <tr>
               <td>
@@ -306,11 +306,11 @@
               <td>
                 <para style="P3">
                   <font color="white"> </font>
-                </para>                    
+                </para>
                 <!--para style="P15">[[ voucher.name ]]</para-->
               </td>
             </tr>
-          </blockTable>          
+          </blockTable>
           <para style="P3">
             <font color="white"> </font>
           </para>
diff --git a/addons/account_check_writing/report/check_print_middle.rml b/addons/account_check_writing/report/check_print_middle.rml
index a6416f9aeb2..5a2f83f20a2 100644
--- a/addons/account_check_writing/report/check_print_middle.rml
+++ b/addons/account_check_writing/report/check_print_middle.rml
@@ -193,7 +193,7 @@
           </para>
         </td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <blockTable colWidths="550.0" rowHeights="10" style="Table5">
             <tr>
               <td>
@@ -215,7 +215,7 @@
               <td>
                 <para style="P9"></para>
               </td>
-            </tr>          
+            </tr>
             <tr>
               <td>
                 <para style="P9"></para>
@@ -237,10 +237,10 @@
               </td>
               <td>
                 <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street or removeParentNode('para') ]]</para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id.address) ]] </para>
-                <para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>                
+                <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
+                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
+                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
+                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
               </td>
             </tr>
           </blockTable>
@@ -254,11 +254,11 @@
               <td>
                 <para style="P3">
                   <font color="white"> </font>
-                </para>                    
+                </para>
                 <!--para style="P15">[[ voucher.name ]]</para-->
               </td>
             </tr>
-          </blockTable>          
+          </blockTable>
           <para style="P3">
             <font color="white"> </font>
           </para>
diff --git a/addons/account_check_writing/report/check_print_top.rml b/addons/account_check_writing/report/check_print_top.rml
index a5068617ebe..41526605f47 100644
--- a/addons/account_check_writing/report/check_print_top.rml
+++ b/addons/account_check_writing/report/check_print_top.rml
@@ -112,7 +112,7 @@
                   <font color="white"> </font>
                 </para>
               </td>
-            </tr>              
+            </tr>
             <tr>
               <td>
                 <para style="P6">
@@ -123,7 +123,7 @@
                 <para style="P9">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
               </td>
             </tr>
-          </blockTable>        
+          </blockTable>
           <blockTable colWidths="54.0,425.0,85.0" rowHeights="21.5" style="Table4">
             <tr>
               <td>
@@ -153,15 +153,15 @@
               </td>
               <td>
                 <para style="P9">[[ voucher.partner_id.name ]] </para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id.address[0]) ]] </para>
-                <para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>  
+                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
+                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
+                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
               </td>
               <td>
                 <para/>
               </td>
             </tr>
-          </blockTable>          
+          </blockTable>
           <blockTable colWidths="25.0,350,150" rowHeights="10.5" style="Table12">
             <tr>
               <td>
@@ -176,7 +176,7 @@
                 <para style="P3">
                   <font color="white"> </font>
                 </para>
-              </td>              
+              </td>
             </tr>
           </blockTable>
           <para style="P3">
@@ -184,7 +184,7 @@
           </para>
         </td>
       </tr>
-    </blockTable>    
+    </blockTable>
     <blockTable colWidths="568.0" style="Table2" rowHeights="255">
       <tr>
         <td>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 0df8d0acdb4..466c87b8182 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -3,7 +3,7 @@
   <data>
 
     <!-- CODA Configuration -->
-    <menuitem id="menu_manage_coda" name="CODA Configuration" parent="account.menu_finance_accounting" sequence="30"/>
+    <menuitem id="menu_manage_coda" name="CODA Configuration" parent="account.menu_finance_configuration" sequence="30"/>
 
     <!-- CODA Bank Account Configuration -->
     <record id="view_coda_bank_account_search" model="ir.ui.view">
@@ -77,7 +77,7 @@
       <field name="view_mode">tree,form</field>
       <field name="search_view_id" ref="view_coda_bank_account_search"/>
     </record>
-    <menuitem action="action_coda_bank_account_form" id="menu_action_coda_bank_account_form" parent="menu_manage_coda" sequence="1"/>
+    <menuitem action="action_coda_bank_account_form" id="menu_action_coda_bank_account_form" parent="menu_manage_coda" sequence="1" groups="base.group_no_one"/>
        
     <!-- CODA Transaction Types -->
     <record id="view_account_coda_trans_type_tree" model="ir.ui.view">
@@ -111,7 +111,7 @@
       <field name="view_type">form</field>
       <field name="view_mode">tree,form</field>
     </record>
-    <menuitem action="action_account_coda_trans_type_form" id="menu_action_account_coda_trans_type_form" parent="menu_manage_coda" sequence="2"/>
+    <menuitem action="action_account_coda_trans_type_form" id="menu_action_account_coda_trans_type_form" parent="menu_manage_coda" sequence="2" groups="base.group_no_one"/>
 
     <!-- CODA Transaction Codes -->
     <record id="view_account_coda_trans_code_tree" model="ir.ui.view">
@@ -148,7 +148,7 @@
       <field name="view_type">form</field>
       <field name="view_mode">tree,form</field>
     </record>
-    <menuitem action="action_account_coda_trans_code_form" id="menu_action_account_coda_trans_code_form" parent="menu_manage_coda"  sequence="3"/>
+    <menuitem action="action_account_coda_trans_code_form" id="menu_action_account_coda_trans_code_form" parent="menu_manage_coda"  sequence="3" groups="base.group_no_one"/>
 
     <!-- CODA Transaction Categories -->
     <record id="view_account_coda_trans_category_tree" model="ir.ui.view">
@@ -180,7 +180,7 @@
       <field name="view_type">form</field>
       <field name="view_mode">tree,form</field>
     </record>
-    <menuitem action="action_account_coda_trans_category_form" id="menu_action_account_coda_trans_category_form" parent="menu_manage_coda"  sequence="4"/>
+    <menuitem action="action_account_coda_trans_category_form" id="menu_action_account_coda_trans_category_form" parent="menu_manage_coda"  sequence="4" groups="base.group_no_one"/>
 
     <!-- CODA Structured Communication Types -->
     <record id="view_account_coda_comm_type_tree" model="ir.ui.view">
@@ -212,7 +212,7 @@
       <field name="view_type">form</field>
       <field name="view_mode">tree,form</field>
     </record>
-    <menuitem action="action_account_coda_comm_type_form" id="menu_action_account_coda_comm_type_form" parent="menu_manage_coda"  sequence="5"/>
+    <menuitem action="action_account_coda_comm_type_form" id="menu_action_account_coda_comm_type_form" parent="menu_manage_coda"  sequence="5" groups="base.group_no_one"/>
 
     <!-- CODA Processing -->
     <menuitem name="CODA Processing" parent="account.menu_finance_bank_and_cash" id="menu_account_coda" groups="base.group_extended" sequence="40"/>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 764ab81d81a..fe4613d6720 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -157,25 +157,5 @@
             </field>
         </record>
         
-        <!--   Configure Follow-Ups  Wizard    -->
-        
-          <record id="action_view_account_followup_followup_form" model="ir.actions.act_window">
-            <field name="name">Review Invoicing Follow-Ups</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account_followup.followup</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="context" eval="'{\'res_id\': %s}' % (ref('demo_followup1'),)"/>
-            <field name="view_id" ref="view_account_followup_followup_form"/>
-        </record>
-        
-         <!--      register configuration wizard -->
-        <record id="config_wizard_view_account_followup_followup_form" model="ir.actions.todo">
-            <field name="action_id" ref="action_view_account_followup_followup_form"/>
-            <field name="category_id" ref="account.category_accounting_configuration"/>
-        </record>
-        
-        
-
     </data>
 </openerp>
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 56004cebde3..8d64ce30f6b 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -45,9 +45,8 @@ class report_rappel(report_sxw.rml_parse):
 
     def _adr_get(self, stat_line, type):
         res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
-        res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
         adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type]
-        return adr and res_partner_address.read(self.cr, self.uid, [adr]) or [{}]
+        return adr and res_partner.read(self.cr, self.uid, [adr]) or [{}]
 
     def _lines_get(self, stat_by_partner_line):
         pool = pooler.get_pool(self.cr.dbname)
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 1a5f3c0b60b..088ff868ca0 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -89,8 +89,8 @@ class account_followup_stat_by_partner(osv.osv):
         tools.drop_view_if_exists(cr, 'account_followup_stat_by_partner')
         # Here we don't have other choice but to create a virtual ID based on the concatenation
         # of the partner_id and the company_id, because if a partner is shared between 2 companies,
-        # we want to see 2 lines for him in this table. It means that both company should be able 
-        # to send him followups separately . An assumption that the number of companies will not 
+        # we want to see 2 lines for him in this table. It means that both company should be able
+        # to send him followups separately . An assumption that the number of companies will not
         # reach 10 000 records is made, what should be enough for a time.
         cr.execute("""
             create or replace view account_followup_stat_by_partner as (
@@ -234,14 +234,13 @@ class account_followup_print_all(osv.osv_memory):
                 for line in data_lines:
                     total_amt += line.debit - line.credit
                 dest = False
-                if partner.address:
-                    for adr in partner.address:
-                        if adr.type=='contact':
-                            if adr.email:
-                                dest = [adr.email]
-                        if (not dest) and adr.type=='default':
-                            if adr.email:
-                                dest = [adr.email]
+                if partner:
+                    if partner.type=='contact':
+                        if adr.email:
+                            dest = [partner.email]
+                    if (not dest) and partner.type=='default':
+                        if partner.email:
+                            dest = [partner.email]
                 src = tools.config.options['email_from']
                 if not data.partner_lang:
                     body = data.email_body
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 062349f7716..f51120aa9da 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -112,7 +112,7 @@
         <field name="search_view_id" ref="view_notify_message_search"/>
     </record>
 
-    <menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
+    <menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration" sequence="45"/>
     <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
 
     </data>
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 2cff52d4146..eec4b974e2b 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -193,13 +193,13 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -247,7 +247,7 @@
           <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
+          <para style="terp_default_Centre_9">[[ (o.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index f474a44d161..97a7f131df6 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -197,12 +197,12 @@
         </td>
         <td>
           <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ display_address(o.address_invoice_id) ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id, 'invoice') ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
@@ -251,7 +251,7 @@
           <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
+          <para style="terp_default_Centre_9">[[ ( o.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 1de715dc777..70d3fbe54cc 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -35,7 +35,7 @@ class payment_mode(osv.osv):
             domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'),
         'company_id': fields.many2one('res.company', 'Company',required=True),
         'partner_id':fields.related('company_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True,),
-        
+
     }
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
@@ -51,14 +51,14 @@ class payment_mode(osv.osv):
             JOIN payment_mode pm ON (pm.bank_id = pb.id)
             WHERE pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
-    
+
     def onchange_company_id (self, cr, uid, ids, company_id=False, context=None):
         result = {}
         if company_id:
             partner_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).partner_id.id
             result['partner_id'] = partner_id
         return {'value': result}
-                
+
 
 payment_mode()
 
@@ -183,57 +183,30 @@ class payment_line(osv.osv):
                 "reference": "ref"}.get(orig, orig)
 
     def info_owner(self, cr, uid, ids, name=None, args=None, context=None):
-        if not ids: return {}
-        partner_zip_obj = self.pool.get('res.partner.zip')
-
         result = {}
-        info=''
         for line in self.browse(cr, uid, ids, context=context):
             owner = line.order_id.mode.bank_id.partner_id
-            result[line.id] = False
-            if owner.address:
-                for ads in owner.address:
-                    if ads.type == 'default':
-                        st = ads.street and ads.street or ''
-                        st1 = ads.street2 and ads.street2 or ''
-                        if 'zip_id' in ads:
-                            zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
-                        else:
-                            zip = ads.zip and ads.zip or ''
-                            city = ads.city and ads.city or  ''
-                            zip_city = zip + ' ' + city
-                        cntry = ads.country_id and ads.country_id.name or ''
-                        info = owner.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
-                        result[line.id] = info
-                        break
+            result[line.id] = self._get_info_partner(cr, uid, owner, context=context)
         return result
 
+    def _get_info_partner(self,cr, uid, partner_record, context=None):
+        if not partner_record:
+            return False
+        st = partner_record.street or ''
+        st1 = partner_record.street2 or ''
+        zip = partner_record.zip or ''
+        city = partner_record.city or  ''
+        zip_city = zip + ' ' + city
+        cntry = partner_record.country_id and partner_record.country_id.name or ''
+        return partner_record.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
+
     def info_partner(self, cr, uid, ids, name=None, args=None, context=None):
-        if not ids: return {}
-        partner_zip_obj = self.pool.get('res.partner.zip')
         result = {}
-        info = ''
-
         for line in self.browse(cr, uid, ids, context=context):
             result[line.id] = False
             if not line.partner_id:
                 break
-            partner = line.partner_id.name or ''
-            if line.partner_id.address:
-                for ads in line.partner_id.address:
-                    if ads.type == 'default':
-                        st = ads.street and ads.street or ''
-                        st1 = ads.street2 and ads.street2 or ''
-                        if 'zip_id' in ads:
-                            zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
-                        else:
-                            zip = ads.zip and ads.zip or ''
-                            city = ads.city and ads.city or  ''
-                            zip_city = zip + ' ' + city
-                        cntry = ads.country_id and ads.country_id.name or ''
-                        info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
-                        result[line.id] = info
-                        break
+            result[line.id] = self._get_info_partner(cr, uid, line.partner_id, context=context)
         return result
 
     #dead code
@@ -420,7 +393,6 @@ class payment_line(osv.osv):
 
     def onchange_partner(self, cr, uid, ids, partner_id, payment_type, context=None):
         data = {}
-        partner_zip_obj = self.pool.get('res.partner.zip')
         partner_obj = self.pool.get('res.partner')
         payment_mode_obj = self.pool.get('payment.mode')
         data['info_partner'] = data['bank_id'] = False
@@ -428,24 +400,7 @@ class payment_line(osv.osv):
         if partner_id:
             part_obj = partner_obj.browse(cr, uid, partner_id, context=context)
             partner = part_obj.name or ''
-
-            if part_obj.address:
-                for ads in part_obj.address:
-                    if ads.type == 'default':
-                        st = ads.street and ads.street or ''
-                        st1 = ads.street2 and ads.street2 or ''
-
-                        if 'zip_id' in ads:
-                            zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or ''
-                        else:
-                            zip = ads.zip and ads.zip or ''
-                            city = ads.city and ads.city or  ''
-                            zip_city = zip + ' ' + city
-
-                        cntry = ads.country_id and ads.country_id.name or ''
-                        info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry
-
-                        data['info_partner'] = info
+            data['info_partner'] = self._get_info_partner(cr, uid, part_obj, context=context)
 
             if part_obj.bank_ids and payment_type:
                 bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type, context=context)
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 00c4b15b252..71856dcf703 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -93,7 +93,7 @@
             <field name="search_view_id" ref="view_payment_mode_search"/>
         </record>
 
-        <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="account.menu_configuration_misc"/>
+        <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="account.menu_configuration_misc" groups="base.group_no_one"/>
 
         <record id="view_payment_order_form" model="ir.ui.view">
             <field name="name">payment.order.form</field>
diff --git a/addons/account_payment/i18n/am.po b/addons/account_payment/i18n/am.po
new file mode 100644
index 00000000000..60ae0ae5e80
--- /dev/null
+++ b/addons/account_payment/i18n/am.po
@@ -0,0 +1,726 @@
+# Amharic 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-03-21 15:50+0000\n"
+"Last-Translator: Araya <info@climaxtechnologies.com>\n"
+"Language-Team: Amharic <am@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-03-22 04:57+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr "የአከፋፈል መንገድ ምረጥ"
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"When an order is placed the state is 'Draft'.\n"
+" Once the bank is confirmed the state is set to 'Confirmed'.\n"
+" Then the order is paid the state is 'Done'."
+msgstr ""
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_id:0
+#: field:payment.mode,company_id:0
+#: field:payment.order,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr ""
+
+#. module: account_payment
+#: model:res.groups,name:account_payment.group_account_payment
+msgid "Accounting / Payments"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: 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_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: field:payment.mode,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr ""
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr ""
+
+#. module: account_payment
+#: 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_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "No partner defined on entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr ""
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request from your company to pay a supplier "
+"invoice or a customer credit note. Here you can register all payment orders "
+"that should be done, keep track of all payment orders and mention the "
+"invoice reference and the partner the payment should be done for."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr ""
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 4bae0c30ce6..135059c79d5 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -4,6 +4,7 @@
 
     <record id="group_account_payment" model="res.groups">
         <field name="name">Accounting / Payments</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     <record id="account.group_account_invoice" model="res.groups">
         <field name="implied_ids" eval="[(4, ref('group_account_payment'))]"/>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 3ed173cca85..54226166508 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -903,7 +903,7 @@ class account_voucher(osv.osv):
         if voucher_brw.number:
             name = voucher_brw.number
         elif voucher_brw.journal_id.sequence_id:
-            name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id)
+            name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=context)
         else:
             raise osv.except_osv(_('Error !'),
                         _('Please define a sequence on the journal !'))
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index d75c386e259..5ff48e7d35d 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -73,8 +73,6 @@
 -
   !record {model: account.invoice, id: account_invoice_jan}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.USD
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@@ -108,8 +106,6 @@
 -
   !record {model: account.invoice, id: account_invoice_feb}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.USD
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index 0ad523b8004..85d710f235a 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -44,8 +44,6 @@
   !record {model: account.invoice, id: account_first_invoice_jan_suppl}:
     account_id: account.a_pay
     type : in_invoice
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.USD
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@@ -80,8 +78,6 @@
 -
   !record {model: account.invoice, id: account_second_invoice_feb_suppl}:
     account_id: account.a_pay
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.USD
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index ac77aef622d..e420abda961 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -79,8 +79,6 @@
 -
   !record {model: account.invoice, id: account_first_invoice_jan}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.USD
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@@ -114,8 +112,6 @@
 -
   !record {model: account.invoice, id: account_second_invoice_feb}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.USD
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index a3a32a32082..c4c94541e10 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -79,8 +79,6 @@
 -
   !record {model: account.invoice, id: account_first_invoice_jan_michal}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.USD
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@@ -114,8 +112,6 @@
 -
   !record {model: account.invoice, id: account_second_invoice_feb_michal}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.USD
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index a2fc39e1844..c99f0d968c9 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -33,8 +33,6 @@
 -
   !record {model: account.invoice, id: account_first_invoice_jan_eur}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.EUR
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
@@ -68,8 +66,6 @@
 -
   !record {model: account.invoice, id: account_second_invoice_feb_eur}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.EUR
     date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index ff8db125682..9d9b4d77994 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -67,8 +67,6 @@
 -
   !record {model: account.invoice, id: account_first_invoice_jan_cad}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_3000
-    address_invoice_id: base.res_partner_address_3000
     company_id: base.main_company
     currency_id: base.CAD
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml
index f6025389896..8d861154a48 100644
--- a/addons/account_voucher/test/sales_payment.yml
+++ b/addons/account_voucher/test/sales_payment.yml
@@ -3,8 +3,6 @@
 -
   !record {model: account.invoice, id: account_invoice_0}:
     account_id: account.a_recv
-    address_contact_id: base.res_partner_address_7
-    address_invoice_id: base.res_partner_address_7
     company_id: base.main_company
     currency_id: base.EUR
     invoice_line:
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 6241b6e06f0..6e800247cb5 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -165,7 +165,6 @@ class account_analytic_account(osv.osv):
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'contact_id': fields.many2one('res.partner.address', 'Contact'),
         'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
@@ -199,7 +198,6 @@ class account_analytic_account(osv.osv):
         'state': 'open',
         'user_id': lambda self, cr, uid, ctx: uid,
         'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
-        'contact_id': lambda self, cr, uid, ctx: ctx.get('contact_id', False),
         'date_start': lambda *a: time.strftime('%Y-%m-%d'),
         'currency_id': _get_default_currency,
     }
@@ -219,12 +217,6 @@ class account_analytic_account(osv.osv):
         default['line_ids'] = []
         return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
 
-    def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
-        if not partner_id:
-            return {'value': {'contact_id': False}}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['invoice'])
-        return {'value': {'contact_id': addr.get('invoice', False)}}
-
     def on_change_company(self, cr, uid, id, company_id):
         if not company_id:
             return {}
@@ -244,13 +236,6 @@ class account_analytic_account(osv.osv):
             res['value']['partner_id'] = partner
         return res
 
-    def onchange_partner_id(self, cr, uid, ids, partner, context=None):
-        partner_obj = self.pool.get('res.partner')
-        if not partner:
-            return {'value':{'contact_id': False}}
-        address = partner_obj.address_get(cr, uid, [partner], ['contact'])
-        return {'value':{'contact_id': address['contact']}}
-
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args=[]
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 3f8ec1036be..69c1a069502 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -15,7 +15,7 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     
-    <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
+    <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting</field>
         <field name="category_id" ref="base.module_category_usability"/>
     </record>
diff --git a/addons/anonymization/ir.model.fields.anonymization.csv b/addons/anonymization/ir.model.fields.anonymization.csv
index 2d7ac5de31a..9c57d38d437 100644
--- a/addons/anonymization/ir.model.fields.anonymization.csv
+++ b/addons/anonymization/ir.model.fields.anonymization.csv
@@ -1,15 +1,15 @@
 id,model_name,field_name
 anonymization_field_res_partner_name,res.partner,name
 anonymization_field_res_partner_code,res.partner,ref
-anonymization_field_res_partner_address_name,res.partner.address,name
-anonymization_field_res_partner_address_city,res.partner.address,city
-anonymization_field_res_partner_address_street,res.partner.address,street
-anonymization_field_res_partner_address_street2,res.partner.address,street2
-anonymization_field_res_partner_address_zip,res.partner.address,zip
-anonymization_field_res_partner_address_phone,res.partner.address,phone
-anonymization_field_res_partner_address_fax,res.partner.address,fax
-anonymization_field_res_partner_address_mobile,res.partner.address,mobile
-anonymization_field_res_partner_address_email,res.partner.address,email
+anonymization_field_res_partner_name,res.partner,name
+anonymization_field_res_partner_city,res.partner,city
+anonymization_field_res_partner_street,res.partner,street
+anonymization_field_res_partner_street2,res.partner,street2
+anonymization_field_res_partner_zip,res.partner,zip
+anonymization_field_res_partner_phone,res.partner,phone
+anonymization_field_res_partner_fax,res.partner,fax
+anonymization_field_res_partner_mobile,res.partner,mobile
+anonymization_field_res_partner_email,res.partner,email
 anonymization_field_account_invoice_amount_untaxed,account.invoice,amount_untaxed
 anonymization_field_account_invoice_amount_tax,account.invoice,amount_tax
 anonymization_field_account_invoice_amount_total,account.invoice,amount_total
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 5f81769eb1a..9be0b6919c7 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -9,6 +9,6 @@
             web_icon="images/association.png"
             web_icon_hover="images/association-hover.png"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
-        <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
+        <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
     </data>
 </openerp>
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index e701e399acf..6d8b88f3d06 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -687,9 +687,9 @@ class auction_lots(osv.osv):
             if (lot.auction_id.id, lot.ach_uid.id) in invoices:
                 inv_id = invoices[(lot.auction_id.id, lot.ach_uid.id)]
             else:
-                add = res_obj.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address']
-                if not len(add):
-                    raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Invoice Address.'))
+                add = res_obj.address_get(cr, uid, [lot.ach_uid.id], ['default'])['default']
+                if not add:
+                    raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Address.'))
                 inv = {
                     'name':lot.auction_id.name or '',
                     'reference': lot.ach_login,
@@ -751,8 +751,8 @@ class auction_bid(osv.osv):
         if not partner_id:
             return {'value': {'contact_tel':False}}
         contact = self.pool.get('res.partner').browse(cr, uid, partner_id)
-        if len(contact.address):
-            v_contact=contact.address[0] and contact.address[0].phone
+        if contact:
+            v_contact=contact.phone
         else:
             v_contact = False
         return {'value': {'contact_tel': v_contact}}
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index ebc336caa72..5100e8d9d0a 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -107,9 +107,10 @@
 
     <record id="partner_record1" model="res.partner">
         <field name="name">Unknown</field>
+        <field name="is_company">1</field>
     </record>
 
-    <record id="res_partner_unknown_address_1" model="res.partner.address">
+    <record id="res_partner_unknown_address_1" model="res.partner">
         <field name="city">Bruxelles1</field>
         <field name="name">Benoit Mortie1r1</field>
         <field name="zip">1030</field>
@@ -118,22 +119,24 @@
         <field name="phone">(+32)2 211 34 83</field>
         <field name="street">Rue des Palais 44, bte 33</field>
         <field name="type">default</field>
-        <field name="partner_id" ref="partner_record1"/>
+        <field name="use_parent_address" eval="0"/>
+        <field name="parent_id" ref="partner_record1"/>
     </record>
 
-    <record id="res_partner_unknown_address_2" model="res.partner.address">
+    <record id="res_partner_unknown_address_2" model="res.partner">
         <field name="city">Avignon CEDEX 091</field>
-        <field name="name">Laurent Jacot1</field>
+        <field name="name">Lara</field>
         <field name="zip">84911</field>
         <field name="country_id" model="res.country" search="[('name','=','France')]"/>
         <field name="email">contact@tecsas.fr</field>
         <field name="phone">(+33)4.32.74.10.57</field>
         <field name="street">85 rue du traite de Rome</field>
         <field name="type">default</field>
-        <field name="partner_id" ref="partner_record1"/>
+        <field name="use_parent_address" eval="0"/>
+        <field name="parent_id" ref="partner_record1"/>
     </record>
 
-    <record id="res_partner_unknown_address_3" model="res.partner.address">
+    <record id="res_partner_unknown_address_3" model="res.partner">
         <field name="city">Louvain-la-Neuve</field>
         <field name="name">Thomas Passot</field>
         <field name="zip">1348</field>
@@ -141,7 +144,8 @@
         <field name="email">info@mediapole.net</field>
         <field name="phone">(+32).10.45.17.73</field>
         <field name="street">Rue de l'Angelique, 1</field>
-        <field name="partner_id" ref="partner_record1"/>
+        <field name="use_parent_address" eval="0"/>
+        <field name="parent_id" ref="partner_record1"/>
     </record>
 
         <!-- demo data for the auction_artist object-->
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 995ffa78959..0d2a4dd49f8 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -770,7 +770,7 @@
     <menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
     <menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
 
-    <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="group_auction_manager"/>
+    <menuitem name="Auction" id="auction_report_menu" parent="base.menu_reporting" sequence="70" groups="group_auction_manager"/>
 
     <act_window name="Deposit slip"
         context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 668c5d4352b..360d8f38116 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -93,7 +93,7 @@
             <field name="view_id" ref="board_auction_form1"/>
         </record>
 
-        <menuitem name="Dashboard" id="menu_board_auction" parent="auction.auction_report_menu" sequence="0"/>
+        <menuitem name="Auction" id="menu_board_auction" parent="base.menu_reporting_dashboard" sequence="40"/>
 
         <menuitem
             name="Auction DashBoard"
diff --git a/addons/auction/report/buyer_form_report.rml b/addons/auction/report/buyer_form_report.rml
index 7f9a124e2d9..ed1804be8a2 100644
--- a/addons/auction/report/buyer_form_report.rml
+++ b/addons/auction/report/buyer_form_report.rml
@@ -99,7 +99,7 @@
         </td>
         <td>
           <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
-          <para style="Addressee">[[o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) ]]</para>
+          <para style="Addressee">[[o['partner'] and o['partner'] and display_address(o['partner']) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/auction/report/deposit_seller.rml b/addons/auction/report/deposit_seller.rml
index 7259ef005d3..b300784d83a 100644
--- a/addons/auction/report/deposit_seller.rml
+++ b/addons/auction/report/deposit_seller.rml
@@ -84,7 +84,7 @@
           </para>
           <para style="P5">[[o.bord_vnd_id.partner_id.title]]</para>
           <para style="P5">[[o.bord_vnd_id.partner_id.name]]</para>
-          <para style="P5">[[o.bord_vnd_id.partner_id.address and display_address(o.bord_vnd_id.partner_id.address[0]) ]] </para>
+          <para style="P5">[[o.bord_vnd_id.partner_id and display_address(o.bord_vnd_id.partner_id) ]] </para>
           <para style="P6">
             <font color="white"> </font>
           </para>
diff --git a/addons/auction/report/seller_form_report.rml b/addons/auction/report/seller_form_report.rml
index 5d1669802b4..da83950b463 100644
--- a/addons/auction/report/seller_form_report.rml
+++ b/addons/auction/report/seller_form_report.rml
@@ -74,7 +74,7 @@
         </td>
         <td>
           <para style="Addressee">[[ o['partner'] and o['partner'].name or False]]</para>
-          <para style="Addressee">[[ o['partner'] and o['partner'].address and display_address(o['partner'].address[0]) </para>
+          <para style="Addressee">[[ o['partner'] and o['partner'] and display_address(o['partner']) </para>
           <para style="P4">
             <font color="white"> </font>
           </para>
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 087151cb6ea..d71254dd3c2 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -16,6 +16,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="module_category_auction"/>
         <field name="implied_ids" eval="[(4, ref('group_auction_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/auction/test/auction.yml b/addons/auction/test/auction.yml
index f970ffe86dd..78c601502f1 100644
--- a/addons/auction/test/auction.yml
+++ b/addons/auction/test/auction.yml
@@ -1,6 +1,6 @@
 -
   In order to test the auction module in the OpenERP I start the process by creating a product.
-- 
+-
   !record {model: product.product, id: product_product_furniture0}:
     categ_id: product.cat1
     cost_method: standard
@@ -16,55 +16,53 @@
     warranty: 0.0
     weight: 0.0
     weight_net: 0.0
-    
+
+-
+  I create a new artist for an object.
 -
-  I create a new artist for an object. 
-- 
   !record {model: auction.artists, id: auction_artists_vincentvangogh0}:
     birth_death_dates: 1853-1900
     name: Vincent van Gogh
- 
-- 
-  I am modifying an expenses journal record for analytic journal. 
-- 
+
+-
+  I am modifying an expenses journal record for analytic journal.
+-
   !record {model: account.journal, id: account.expenses_journal}:
     analytic_journal_id: account.exp
-- 
-  I am modifying a sales journal record for analytic journal. 
-- 
+-
+  I am modifying a sales journal record for analytic journal.
+-
   !record {model: account.journal, id: account.sales_journal}:
-    analytic_journal_id: account.cose_journal_sale    
+    analytic_journal_id: account.cose_journal_sale
 
 -
   I'm creating new Buyer "Mr. Patel" with his email "info@myinfobid.com".
-- 
+-
   !record {model: res.partner, id: res_partner_mrpatel0}:
-    address:
-      - city: Bruxelles
+        name: Mr. Patel
+        city: Bruxelles
         country_id: base.be
         street: Rue des Palais 51, bte 33
         type: default
         zip: '1000'
         email: 'info@myinfobid.com'
-    name: Mr. Patel
-        
+
 -
   I'm creating new Buyer "Mr. Rahi" with his email "info@poalrahi.com".
-- 
+-
   !record {model: res.partner, id: res_partner_poalrahi0}:
-    address:
-      - city: Bruxelles
+        name: Mr. Rahi
+        city: Bruxelles
         country_id: base.be
         street: Rue des Palais 51, bte 33
         type: default
         zip: '1000'
         email: 'info@poalrahi.com'
-    name: Mr. Rahi
-        
-    
+
+
 -
   I create an Account tax with 0.03 amount to give Buyer "3%" Commission.
-- 
+-
   !record {model: account.tax, id: account_tax_buyer0}:
     amount: 0.029999999999999999
     applicable_type: 'true'
@@ -76,7 +74,7 @@
     type_tax_use: all
 -
   I create another Account tax with 0.04 amount to give seller "4%" commission.
-- 
+-
   !record {model: account.tax, id: account_tax_sellercosts0}:
     amount: 0.040000000000000001
     applicable_type: 'true'
@@ -85,8 +83,8 @@
     name: Seller Costs(%4)
     sequence: 1
     type: percent
-    type_tax_use: all      
-                  
+    type_tax_use: all
+
 -
   Now I want to associate an object with the auction so for that I create an auction "Antique furniture exhibition" which
   start from 1 Aug to 31 Aug with Seller Commission 4%, buyer commission 3%.
@@ -105,9 +103,9 @@
     seller_costs:
       - auction.account_tax_sellercosts0
     buyer_costs:
-      - auction.account_tax_buyer0       
+      - auction.account_tax_buyer0
 -
-  An object is being deposited for an auction,I create a seller's deposit record with deposit cost.  
+  An object is being deposited for an auction,I create a seller's deposit record with deposit cost.
 -
   !record {model: auction.deposit, id: auction_deposit_ad0}:
     date_dep: !eval "'%s-08-01' %(datetime.now().year)"
@@ -117,7 +115,7 @@
     specific_cost_ids:
       - account: auction.auction_expense
         amount: 200.0
-        name: Transfer Cost    
+        name: Transfer Cost
 -
   I create a new object wooden-chair which is to be auctioned.
 -
@@ -156,7 +154,7 @@
 
 -
   I create another bid for an object "wooden-chair" bid by a Mr.poalrahi
--  
+-
   !record {model: auction.bid, id: auction_bid_bid1}:
     auction_id: auction_dates_antiquefurnitureexhibition0
     name: bid/002
@@ -170,10 +168,10 @@
     call: 1
     lot_id: auction.auction_lots_woodenchair0
     price: 3200.0
- 
+
 -
   I create another bid for an object "wooden-chair" bid by a Mr.Seagate
--  
+-
   !record {model: auction.bid, id: auction_bid_bid2}:
     auction_id: auction_dates_antiquefurnitureexhibition0
     name: bid/003
@@ -202,7 +200,7 @@
   !python {model: auction.lots}: |
     self.button_bought(cr, uid, [ref("auction_lots_woodenchair0")], {"lang": "en_US", "tz":
       False, "active_model": "ir.ui.menu", "active_ids": [ref("auction.auction_lots_woodenchair0")],
-      "active_id": ref("auction.auction_lots_woodenchair0")})   
+      "active_id": ref("auction.auction_lots_woodenchair0")})
 -
   I click on the "Create all invoices" button for all Objects in this Auction.
 -
@@ -216,8 +214,8 @@
  !python {model: auction.lots}: |
     from tools.translate import _
     auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
-    assert(auc_id.sel_inv_id), _('Seller Invoice has not been created!') 
-    
+    assert(auc_id.sel_inv_id), _('Seller Invoice has not been created!')
+
 -
   I create a buyer's invoice by using the "Invoice Buyer objects" wizard.
 -
@@ -238,10 +236,10 @@
   !python {model: auction.lots}: |
     from tools.translate import _
     auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
-    assert(auc_id.ach_inv_id), _('Buyer Invoice has not been created!')     
-- 
+    assert(auc_id.ach_inv_id), _('Buyer Invoice has not been created!')
+-
   Buyer pays the invoice
-- 
+-
   !python {model: account.invoice}: |
     obj_lots = self.pool.get('auction.lots')
     lots_id = obj_lots.browse(cr, uid, ref("auction_lots_woodenchair0"))
@@ -279,9 +277,9 @@
 -
   !record {model: auction.lots.auction.move, id: auction_lots_auction_move_0}:
     auction_id: auction.auction_date_2
-- 
+-
   I click on the "Move to Auction date" button.
-- 
+-
   !python {model: auction.lots.auction.move}: |
     self.auction_move_set(cr, uid, [ref("auction_lots_auction_move_0")], {"lang":
       "en_US", "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_woodenchair0")],
@@ -294,4 +292,4 @@
     auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
     auc_lot_his=self.pool.get('auction.lot.history')
     ids=auc_lot_his.search(cr, uid, [('lot_id', '=', auc_id.id)])
-    assert ids, _('Auction history does not exists!')     
+    assert ids, _('Auction history does not exists!')
diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py
index 93faab41275..fe05e538be7 100644
--- a/addons/auction/wizard/auction_lots_sms_send.py
+++ b/addons/auction/wizard/auction_lots_sms_send.py
@@ -47,18 +47,16 @@ class auction_lots_sms_send(osv.osv_memory):
         if context is None: context = {}
         lot_obj = self.pool.get('auction.lots')
         partner_obj = self.pool.get('res.partner')
-        partner_address_obj = self.pool.get('res.partner.address')
         for data in self.read(cr, uid, ids, context=context):
             lots = lot_obj.read(cr, uid, context.get('active_ids', []), ['obj_num','obj_price','ach_uid'])
             res = partner_obj.read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context)
-            
             nbr = 0
             for r in res:
                 add = partner_obj.address_get(cr, uid, [r['id']])['default']
-                addr = partner_address_obj.browse(cr, uid, add, context=context)
+                addr = partner_obj.browse(cr, uid, add, context=context)
                 to = addr.mobile
                 if to:
-                    tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
+                    tools.sms_send(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
                     nbr += 1
             return {'sms_sent': nbr}
 auction_lots_sms_send()
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 5147448733a..78a180e8d4d 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -375,8 +375,7 @@ class audittrail_objects_proxy(object_proxy):
               }
 
         The reason why the structure returned is build as above is because when modifying an existing 
-        record (res.partner, for example), we may have to log a change done in a x2many field (on 
-        res.partner.address, for example)
+        record, we may have to log a change done in a x2many field of that object
         """
         key = (model.id, resource_id)
         lines = {
diff --git a/addons/auth_openid/i18n/fi.po b/addons/auth_openid/i18n/fi.po
new file mode 100644
index 00000000000..64b8bf42ca7
--- /dev/null
+++ b/addons/auth_openid/i18n/fi.po
@@ -0,0 +1,112 @@
+# Finnish 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-03-30 09:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-31 05:09+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:res.users:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
+msgid "OpenID"
+msgstr "OpenID"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:res.users,openid_url:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
+msgid "OpenID URL"
+msgstr "OpenID URL"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr "Käytetään täsmennyksenä, jos käytössä jaettu OpenID URL"
+
+#. module: auth_openid
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "OpenID sähköposti"
+
+#. module: auth_openid
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr "OpenID avain"
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
+msgid "Password"
+msgstr "Salasana"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google"
+msgstr "Google"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google Apps"
+msgstr "Google apps"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
+msgid "Google Apps Domain:"
+msgstr "Google Apps toimialue:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
+msgid "Username:"
+msgstr "Käyttäjätunnus:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
+msgid "OpenID URL:"
+msgstr "OpenID URL:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
+msgid "Google Apps Domain"
+msgstr "Google Apps toimialue"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
+msgid "Username"
+msgstr "Käyttäjänimi"
diff --git a/addons/auth_openid/res_users.py b/addons/auth_openid/res_users.py
index c9b5bfc7b26..3fb8cefcbd4 100644
--- a/addons/auth_openid/res_users.py
+++ b/addons/auth_openid/res_users.py
@@ -65,8 +65,10 @@ class res_users(osv.osv):
             return result
         else:
             with utils.cursor(db) as cr:
-                cr.execute('UPDATE res_users SET date=now() WHERE login=%s AND openid_key=%s AND active=%s RETURNING id',
-                        (tools.ustr(login), tools.ustr(password), True))
+                cr.execute("""UPDATE res_users
+                                SET date=now() AT TIME ZONE 'UTC'
+                                WHERE login=%s AND openid_key=%s AND active=%s RETURNING id""",
+                           (tools.ustr(login), tools.ustr(password), True))
                 res = cr.fetchone()
                 cr.commit()
                 return res[0] if res else False
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 249fea89e0e..50ebd96a3c2 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -24,6 +24,7 @@ from tools.translate import _
 from datetime import datetime
 from datetime import timedelta
 from tools.safe_eval import safe_eval
+from tools import ustr
 import pooler
 import re
 import time
@@ -369,8 +370,8 @@ the rule to mark CC(mail to any other person defined in actions)."),
         reg_name = action.regex_name
         result_name = True
         if reg_name:
-            ptrn = re.compile(str(reg_name))
-            _result = ptrn.search(str(obj.name))
+            ptrn = re.compile(ustr(reg_name))
+            _result = ptrn.search(ustr(obj.name))
             if not _result:
                 result_name = False
         regex_n = not reg_name or result_name
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 584bc46ab34..65b37fb4c1d 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="base.menu_base_action_rule" name="Automated Actions"
+       <!--   <menuitem id="base.menu_base_action_rule" name="Automated Actions"
             groups="base.group_extended"
-            parent="base.menu_base_config" sequence="20" />
+            parent="base.menu_base_config" sequence="20" />-->
         <menuitem id="base.menu_base_action_rule_admin" name="Automated Actions"
             groups="base.group_extended"
             parent="base.menu_custom" />
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 814b9587753..4dffd8bcbf8 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -250,8 +250,8 @@ class calendar_attendee(osv.osv):
             if name == 'cn':
                 if attdata.user_id:
                     result[id][name] = attdata.user_id.name
-                elif attdata.partner_address_id:
-                    result[id][name] = attdata.partner_address_id.name or attdata.partner_id.name
+                elif attdata.partner_id:
+                    result[id][name] = attdata.partner_id.name or False
                 else:
                     result[id][name] = attdata.email or ''
 
@@ -365,9 +365,7 @@ that points to the directory information corresponding to the attendee."),
                     store=True, help="To specify the language for text values in a\
 property or property parameter."),
         'user_id': fields.many2one('res.users', 'User'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Contact'),
-        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', \
-                        relation='res.partner', string='Partner', help="Partner related to contact"),
+        'partner_id': fields.many2one('res.partner', 'Contact'),
         'email': fields.char('Email', size=124, help="Email of Invited Person"),
         'event_date': fields.function(_compute_data, string='Event Date', \
                             type="datetime", multi='event_date'),
@@ -1618,20 +1616,13 @@ class ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
 
     def search_count(self, cr, user, args, context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param user: the current user’s ID for security checks,
-        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-        @param context: A standard dictionary for contextual values
-        """
-
-        args1 = []
-        for arg in args:
-            args1.append(map(lambda x:str(x).split('-')[0], arg))
-        return super(ir_attachment, self).search_count(cr, user, args1, context)
-
-
+        new_args = []
+        for domain_item in args:
+            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
+                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
+            else:
+                new_args.append(domain_item)
+        return super(ir_attachment, self).search_count(cr, user, new_args, context)
 
     def create(self, cr, uid, vals, context=None):
         if context:
@@ -1641,21 +1632,12 @@ class ir_attachment(osv.osv):
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-        @param offset: The Number of Results to pass,
-        @param limit: The Number of Results to Return,
-        @param context: A standard dictionary for contextual values
-        """
-
-        new_args = args
-        for i, arg in enumerate(new_args):
-            if arg[0] == 'res_id':
-                new_args[i] = (arg[0], arg[1], base_calendar_id2real_id(arg[2]))
-
+        new_args = []
+        for domain_item in args:
+            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
+                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
+            else:
+                new_args.append(domain_item)
         return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
                             limit=limit, order=order, context=context, count=False)
 ir_attachment()
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 16064762f9b..e786eff6048 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -22,10 +22,8 @@
                             <group colspan="4" col="4">
                                 <field name="user_id" string="Invited User"/>
                                 <newline/>
-                                <field name="partner_address_id"
-                                    string="Contact" />
                                 <field name="partner_id"
-                                    string="Partner" readonly="1" />
+                                    string="Contact" />
                             </group>
                             <separator string="Event Detail" colspan="4" />
                             <group colspan="4" col="4">
@@ -78,7 +76,7 @@
                     <field name="sent_by_uid" string="Invitation From" />
                     <field name="role" string="My Role"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="partner_address_id" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
                     <field name="cutype" string="Invitation type"/>
                     <field name="state" />
                     <field name="rsvp" string="Required to Join"/>
@@ -132,7 +130,7 @@
                         <filter string="Responsible" icon="terp-personal" domain="[]"
                             context="{'group_by':'user_id'}" />
                         <filter string="Contact" icon="terp-personal" domain="[]"
-                            context="{'group_by':'partner_address_id'}" />
+                            context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
                             domain="[]" context="{'group_by':'cutype'}" />
@@ -159,7 +157,7 @@
 
         <!-- Calenadar's menu -->
         <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="6" groups="base.group_sale_manager" />
+            parent="base.menu_base_config" sequence="50" groups="base.group_sale_manager" />
 
         <!-- Invitation menu -->
 
@@ -215,9 +213,9 @@
         <!--        Menu for Alarms-->
 
          <menuitem id="menu_crm_meeting_avail_alarm"
-            groups="base.group_extended"
+            groups="base.group_no_one"
             action="base_calendar.action_res_alarm_view"
-            parent="base.menu_calendar_configuration" />
+            parent="base.menu_calendar_configuration" sequence="5"/>
 
         <!-- Event Form View-->
 
@@ -350,9 +348,9 @@
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"
                                    attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
-                                <field name="interval" />                               
-                                                       
-                                
+                                <field name="interval" />
+
+
                                 <separator string="End of recurrency" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
@@ -362,8 +360,8 @@
                                 <newline />
                                 <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
                                 <newline />
-                           
-                      
+
+
                             </group>
                             <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
                                 <separator string="Choose day where repeat the meeting" colspan="8"/>
@@ -501,7 +499,7 @@
         <menuitem id="menu_events"
                 name="Events" parent="base.menu_calendar_configuration"
                 groups="base.group_extended"
-                sequence="5" action="action_view_event" />
+                sequence="15" action="action_view_event" />
 
      </data>
  </openerp>
diff --git a/addons/base_calendar/security/calendar_security.xml b/addons/base_calendar/security/calendar_security.xml
index dd736e11714..5fe8918e05b 100644
--- a/addons/base_calendar/security/calendar_security.xml
+++ b/addons/base_calendar/security/calendar_security.xml
@@ -3,6 +3,7 @@
    <data noupdate="0">
 	   <record model="res.groups" id="base.group_survey_user">
         	<field name="name">Survey / User</field>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
 	   </record>
    </data>
 </openerp>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index e3a38c069b8..676f9b3fdd2 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -41,7 +41,7 @@ class base_calendar_invite_attendee(osv.osv_memory):
                                   'invite_id', 'user_id', 'Users'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'email': fields.char('Email', size=124, help="Provide external email address who will receive this invitation."),
-        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel',
+        'contact_ids': fields.many2many('res.partner', 'invite_contact_rel',
                                   'invite_id', 'contact_id', 'Contacts'),
         'send_mail': fields.boolean('Send mail?', help='Check this if you want to \
 send an Email to Invited Person')
@@ -112,10 +112,10 @@ send an Email to Invited Person')
                 mail_to.append(datas['email'])
 
             elif  type == 'partner':
-                add_obj = self.pool.get('res.partner.address')
+                add_obj = self.pool.get('res.partner')
                 for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
                     res = {
-                           'partner_address_id': contact.id,
+                           'partner_id': contact.id,
                            'email': contact.email
                            }
                     res.update(ref)
@@ -159,8 +159,8 @@ send an Email to Invited Person')
 
         if not partner_id:
             return {'value': {'contact_ids': []}}
-        cr.execute('SELECT id FROM res_partner_address \
-                         WHERE partner_id=%s', (partner_id,))
+        cr.execute('SELECT id FROM res_partner \
+                         WHERE id=%s or parent_id =%s' , (partner_id,partner_id,))
         contacts = map(lambda x: x[0], cr.fetchall())
         return {'value': {'contact_ids': contacts}}
 
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index ef7193e05fe..ea0d444ce54 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -27,7 +27,7 @@
                                 <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
                                 <newline/>
                                 <separator string="Partner Contacts" colspan="6"/>
-                                <field name="contact_ids" select="1" colspan="4" nolabel="1" domain="[('partner_id', '=', partner_id)]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
+                                <field name="contact_ids" select="1" colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
                             </group>
                         </page>
                     </notebook>
diff --git a/addons/base_contact/__init__.py b/addons/base_contact/__init__.py
deleted file mode 100644
index aa3d3b43064..00000000000
--- a/addons/base_contact/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import base_contact
-
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
deleted file mode 100644
index 10bbb463dac..00000000000
--- a/addons/base_contact/__openerp__.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    'name': 'Contacts Management',
-    'version': '1.0',
-    'category': 'Customer Relationship Management',
-    'complexity': "expert",
-    'description': """
-This module allows you to manage your contacts
-==============================================
-
-It lets you define:
-    * contacts unrelated to a partner,
-    * contacts working at several addresses (possibly for different partners),
-    * contacts with possibly different functions for each of its job's addresses
-
-It also adds new menu items located in
-    Purchases / Address Book / Contacts
-    Sales / Address Book / Contacts
-
-Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['base','process'],
-    'init_xml': [],
-    'update_xml': [
-        'security/ir.model.access.csv',
-        'base_contact_view.xml',
-        'process/base_contact_process.xml'
-    ],
-    'demo_xml': ['base_contact_demo.xml'],
-    'test': [
-        'test/base_contact00.yml',
-    ],
-    'installable': True,
-    'auto_install': False,
-    'certificate': '0031287885469',
-    'images': ['images/base_contact1.jpeg','images/base_contact2.jpeg','images/base_contact3.jpeg'],
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
deleted file mode 100644
index 59ac8a0b4df..00000000000
--- a/addons/base_contact/base_contact.py
+++ /dev/null
@@ -1,252 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-import addons
-
-class res_partner_contact(osv.osv):
-    """ Partner Contact """
-
-    _name = "res.partner.contact"
-    _description = "Contact"
-
-    def _name_get_full(self, cr, uid, ids, prop, unknow_none, context=None):
-        result = {}
-        for rec in self.browse(cr, uid, ids, context=context):
-            result[rec.id] = rec.last_name+' '+(rec.first_name or '')
-        return result
-
-    _columns = {
-        'name': fields.function(_name_get_full, string='Name', size=64, type="char", store=True, select=True),
-        'last_name': fields.char('Last Name', size=64, required=True),
-        'first_name': fields.char('First Name', size=64),
-        'mobile': fields.char('Mobile', size=64),
-        'title': fields.many2one('res.partner.title','Title', domain=[('domain','=','contact')]),
-        'website': fields.char('Website', size=120),
-        'lang_id': fields.many2one('res.lang', 'Language'),
-        'job_ids': fields.one2many('res.partner.address', 'contact_id', 'Functions and Addresses'),
-        'country_id': fields.many2one('res.country','Nationality'),
-        'birthdate': fields.char('Birthdate', size=64),
-        'active': fields.boolean('Active', help="If the active field is set to False,\
-                 it will allow you to hide the partner contact without removing it."),
-        'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
-                         relation='res.partner', string='Main Employer'),
-        'function': fields.related('job_ids', 'function', type='char', \
-                                 string='Main Function'),
-        'email': fields.char('E-Mail', size=240),
-        'comment': fields.text('Notes', translate=True),
-        'photo': fields.binary('Photo'),
-    }
-
-    def _get_photo(self, cr, uid, context=None):
-        photo_path = addons.get_module_resource('base_contact', 'images', 'photo.png')
-        return open(photo_path, 'rb').read().encode('base64')
-
-    _defaults = {
-        'photo' : _get_photo,
-        'active' : lambda *a: True,
-    }
-
-    _order = "name"
-
-    def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=None):
-        if not args:
-            args = []
-        if context is None:
-            context = {}
-        if name:
-            ids = self.search(cr, uid, ['|',('name', operator, name),('first_name', operator, name)] + args, limit=limit, context=context)
-        else:
-            ids = self.search(cr, uid, args, limit=limit, context=context)
-        return self.name_get(cr, uid, ids, context=context)
-
-    def name_get(self, cr, uid, ids, context=None):
-        result = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = obj.name or '/'
-            if obj.partner_id:
-                result[obj.id] = result[obj.id] + ', ' + obj.partner_id.name
-        return result.items()
-
-    def _auto_init(self, cr, context=None):
-        def table_exists(view_name):
-            cr.execute('SELECT count(relname) FROM pg_class WHERE relname = %s', (view_name,))
-            value = cr.fetchone()[0]
-            return bool(value == 1)
-
-        exists = table_exists(self._table)
-        super(res_partner_contact, self)._auto_init(cr, context)
-
-        if not exists:
-            cr.execute("""
-                INSERT INTO
-                    res_partner_contact
-                    (id,name,last_name,title,active,email,mobile,birthdate)
-                SELECT
-                    id,COALESCE(name, '/'),COALESCE(name, '/'),title,true,email,mobile,birthdate
-                FROM
-                    res_partner_address""")
-            cr.execute("alter table res_partner_address add contact_id int references res_partner_contact")
-            cr.execute("update res_partner_address set contact_id=id")
-            cr.execute("select setval('res_partner_contact_id_seq', (select max(id)+1 from res_partner_contact))")
-
-res_partner_contact()
-
-class res_partner_location(osv.osv):
-    _name = 'res.partner.location'
-    _rec_name = 'street'
-    _columns = {
-        'street': fields.char('Street', size=128),
-        'street2': fields.char('Street2', size=128),
-        'zip': fields.char('Zip', change_default=True, size=24),
-        'city': fields.char('City', size=128),
-        'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
-        'country_id': fields.many2one('res.country', 'Country'),
-        'company_id': fields.many2one('res.company', 'Company',select=1),
-        'job_ids': fields.one2many('res.partner.address', 'location_id', 'Contacts'),
-        'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
-                         relation='res.partner', string='Main Partner'),
-    }
-    _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner.address', context=c),
-    }
-    def _auto_init(self, cr, context=None):
-        def table_exists(view_name):
-            cr.execute('SELECT count(relname) FROM pg_class WHERE relname = %s', (view_name,))
-            value = cr.fetchone()[0]
-            return bool(value == 1)
-
-        exists = table_exists(self._table)
-        super(res_partner_location, self)._auto_init(cr, context)
-
-        if not exists:
-            cr.execute("""
-                INSERT INTO
-                    res_partner_location
-                    (id,street,street2,zip,city,
-                     state_id,country_id,company_id)
-                SELECT
-                    id,street,street2,zip,city,
-                    state_id,country_id,company_id
-                FROM
-                    res_partner_address""")
-            cr.execute("alter table res_partner_address add location_id int references res_partner_location")
-            cr.execute("update res_partner_address set location_id=id")
-            cr.execute("select setval('res_partner_location_id_seq', (select max(id)+1 from res_partner_address))")
-
-    def name_get(self, cr, uid, ids, context=None):
-        result = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            res = []
-            if obj.partner_id: res.append(obj.partner_id.name_get()[0][1])
-            if obj.city: res.append(obj.city)
-            if obj.country_id: res.append(obj.country_id.name_get()[0][1])
-            result[obj.id] = ', '.join(res)
-        return result.items()
-
-res_partner_location()
-
-class res_partner_address(osv.osv):
-    _inherit = 'res.partner.address'
-
-    def _default_location_id(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        if not context.get('default_partner_id',False):
-            return False
-        ids = self.pool.get('res.partner.location').search(cr, uid, [('partner_id','=',context['default_partner_id'])], context=context)
-        return ids and ids[0] or False
-
-    def onchange_location_id(self,cr, uid, ids, location_id=False, context={}):
-        if not location_id:
-            return {}
-        location = self.pool.get('res.partner.location').browse(cr, uid, location_id, context=context)
-        return {'value':{
-            'street': location.street,
-            'street2': location.street2,
-            'zip': location.zip,
-            'city': location.city,
-            'country_id': location.country_id and location.country_id.id or False,
-            'state_id': location.state_id and location.state_id.id or False,
-        }}
-
-    _columns = {
-        'location_id' : fields.many2one('res.partner.location', 'Location'),
-        'contact_id' : fields.many2one('res.partner.contact', 'Contact'),
-
-        # fields from location
-        'street': fields.related('location_id', 'street', string='Street', type="char", store=True, size=128),
-        'street2': fields.related('location_id', 'street2', string='Street2', type="char", store=True, size=128),
-        'zip': fields.related('location_id', 'zip', string='Zip', type="char", store=True, change_default=True, size=24),
-        'city': fields.related('location_id', 'city', string='City', type="char", store=True, size=128),
-        'state_id': fields.related('location_id', 'state_id', relation="res.country.state", string='Fed. State', type="many2one", store=True, domain="[('country_id','=',country_id)]"),
-        'country_id': fields.related('location_id', 'country_id', type='many2one', string='Country', store=True, relation='res.country'),
-
-        'phone': fields.char('Phone', size=64),
-        'fax': fields.char('Fax', size=64),
-        'email': fields.char('E-Mail', size=240),
-
-        # fields from contact
-        'mobile' : fields.related('contact_id', 'mobile', type='char', size=64, string='Mobile'),
-        'name' : fields.related('contact_id', 'name', type='char', size=64, string="Contact Name", store=True),
-        'title' : fields.related('contact_id', 'title', type='many2one', relation='res.partner.title', string="Title", store=True),
-    }
-    def create(self, cr, uid, data, context={}):
-        if not data.get('location_id', False):
-            loc_id = self.pool.get('res.partner.location').create(cr, uid, {
-                'street': data.get('street',''),
-                'street2': data.get('street2',''),
-                'zip': data.get('zip',''),
-                'city': data.get('city',''),
-                'country_id': data.get('country_id',False),
-                'state_id': data.get('state_id',False)
-            }, context=context)
-            data['location_id'] = loc_id
-        result = super(res_partner_address, self).create(cr, uid, data, context=context)
-        return result
-
-    def name_get(self, cr, uid, ids, context=None):
-        result = {}
-        for rec in self.browse(cr,uid, ids, context=context):
-            res = []
-            if rec.partner_id:
-                res.append(rec.partner_id.name_get()[0][1])
-            if rec.contact_id and rec.contact_id.name:
-                res.append(rec.contact_id.name)
-            if rec.location_id:
-                if rec.location_id.city: res.append(rec.location_id.city)
-                if rec.location_id.country_id: res.append(rec.location_id.country_id.name_get()[0][1])
-            result[rec.id] = ', '.join(res)
-        return result.items()
-
-    _defaults = {
-        'location_id': _default_location_id
-    }
-
-    def default_get(self, cr, uid, fields=[], context=None):
-        if context is None:
-            context = {}
-        if 'default_type' in context:
-            del context['default_type']
-        return super(res_partner_address, self).default_get(cr, uid, fields, context)
-
-res_partner_address()
-
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
deleted file mode 100644
index 888ef6b54b7..00000000000
--- a/addons/base_contact/base_contact_demo.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="base.user_demo" model="res.users">
-            <field eval="[(4,ref('base.group_sale_salesman'))]" name="groups_id"/>
-        </record>
-
-        <!-- Create the contacts -->
-        <record id="res_partner_contact_mortier0" model="res.partner.contact">
-            <field name="first_name">Benoit</field>
-            <field name="last_name">Mortier</field>
-            <field name="title" ref="base.res_partner_title_sir"/>
-        </record>
-        <record id="res_partner_contact_jacot0" model="res.partner.contact">
-            <field name="first_name">Laurent</field>
-            <field name="last_name">Jacot</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_passot0" model="res.partner.contact">
-            <field name="first_name">Thomas</field>
-            <field name="last_name">Passot</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_lacarte0" model="res.partner.contact">
-            <field name="first_name">Etienne</field>
-            <field name="last_name">Lacarte</field>
-        </record>
-        <record id="res_partner_contact_tang0" model="res.partner.contact">
-            <field name="last_name">Tang</field>
-        </record>
-        <record id="res_partner_contact_wong0" model="res.partner.contact">
-            <field name="last_name">Wong</field>
-        </record>
-        <record id="res_partner_contact_lavente0" model="res.partner.contact">
-            <field name="first_name">Jean-Guy</field>
-            <field name="last_name">Lavente</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_lelitre0" model="res.partner.contact">
-            <field name="first_name">Sylvie</field>
-            <field name="last_name">Lelitre</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_grosbonnet0" model="res.partner.contact">
-            <field name="first_name">Arthur</field>
-            <field name="last_name">Grosbonnet</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_lesbrouffe0" model="res.partner.contact">
-            <field name="first_name">Karine</field>
-            <field name="last_name">Lesbrouffe</field>
-            <field ref="base.res_partner_title_madam" name="title"/>
-        </record>
-        <record id="res_partner_contact_zen0" model="res.partner.contact">
-            <field name="last_name">Zen</field>
-        </record>
-        <record id="res_partner_contact_pinckears0" model="res.partner.contact">
-            <field name="website">http://fptiny.blogspot.com/</field>
-            <field name="first_name">Fabien</field>
-            <field name="last_name">Pinckaers</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_debois0" model="res.partner.contact">
-            <field name="first_name">Marc</field>
-            <field name="last_name">Debois</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_luu0" model="res.partner.contact">
-            <field name="first_name">Phuong</field>
-            <field name="last_name">Luu</field>
-            <field ref="base.res_partner_title_madam" name="title"/>
-        </record>
-        <record id="res_partner_contact_elkhayat0" model="res.partner.contact">
-            <field name="first_name">Najlaa</field>
-            <field name="last_name">Khayat</field>
-            <field ref="base.res_partner_title_madam" name="title"/>
-        </record>
-        <record id="res_partner_contact_depaoli0" model="res.partner.contact">
-            <field name="first_name">Quentin</field>
-            <field name="last_name">Paolino</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_semal0" model="res.partner.contact">
-            <field name="first_name">Fabian</field>
-            <field name="last_name">W.</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_vandewerve0" model="res.partner.contact">
-            <field name="first_name">Yvan</field>
-            <field name="last_name">Van</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_lambotte0" model="res.partner.contact">
-            <field name="first_name">Henry</field>
-            <field name="last_name">Lambotte</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_laurent0" model="res.partner.contact">
-            <field name="first_name">Olivier</field>
-            <field name="last_name">Laurent</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_simonis0" model="res.partner.contact">
-            <field name="first_name">Christophe</field>
-            <field name="last_name">Dupont</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_wirtel0" model="res.partner.contact">
-            <field name="first_name">Stéphane</field>
-            <field name="last_name">Andre</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-        <record id="res_partner_contact_mignon0" model="res.partner.contact">
-            <field name="first_name">Philippe</field>
-            <field name="last_name">Antoine</field>
-            <field ref="base.res_partner_title_sir" name="title"/>
-        </record>
-
-
-        <!-- Create the jobs -->
-        <!--
-        <record id="res_partner_job_0" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_1"/>
-            <field name="function">Salesman</field>
-            <field name="contact_id" ref="res_partner_contact_mortier0"/>
-            <field name="sequence_partner">2</field>
-        </record>
-        <record id="res_partner_job_1" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_2"/>
-            <field name="function">Salesman</field>
-            <field name="email">contact@tecsas.fr</field>
-            <field name="contact_id" ref="res_partner_contact_jacot0"/>
-        </record>
-        <record id="res_partner_job_2" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_3"/>
-            <field name="function">CTO</field>
-            <field name="email">info@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_passot0"/>
-        </record>
-        <record id="res_partner_job_3" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_tang"/>
-            <field name="function">Salesman</field>
-            <field name="contact_id" ref="res_partner_contact_tang0"/>
-        </record>
-        <record id="res_partner_job_4" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_wong"/>
-            <field name="function">Salesman</field>
-            <field name="contact_id" ref="res_partner_contact_wong0"/>
-        </record>
-        <record id="res_partner_job_5" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_6"/>
-            <field name="function">CEO</field>
-            <field name="contact_id" ref="res_partner_contact_lacarte0"/>
-            <field name="sequence_contact">1</field>
-            <field name="sequence_partner">0</field>
-
-        </record>
-        <record id="res_partner_job_6" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_7"/>
-            <field name="function">Salesman</field>
-            <field name="contact_id" ref="res_partner_contact_lavente0"/>
-        </record>
-        <record id="res_partner_job_7" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_8"/>
-            <field name="function">CTO</field>
-            <field name="contact_id" ref="res_partner_contact_lelitre0"/>
-        </record>
-        <record id="res_partner_job_8" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_9"/>
-            <field name="function">CEO</field>
-            <field name="contact_id" ref="res_partner_contact_grosbonnet0"/>
-        </record>
-        <record id="res_partner_job_9" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_10"/>
-            <field name="function">Salesman</field>
-            <field name="contact_id" ref="res_partner_contact_lesbrouffe0"/>
-        </record>
-        <record id="res_partner_job_10" model="res.partner.job">
-            <field name="address_id" ref="base.res_partner_address_zen"/>
-            <field name="function">CTO</field>
-            <field name="contact_id" ref="res_partner_contact_zen0"/>
-        </record>
-        <record id="res_partner_job_11" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">Salesman</field>
-            <field name="email">re@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_mignon0"/>
-        </record>
-        <record id="res_partner_job_12" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">CTO</field>
-            <field name="email">st@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_wirtel0"/>
-        </record>
-        <record id="res_partner_job_13" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">CTO</field>
-            <field name="email">ch@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_simonis0"/>
-        </record>
-        <record id="res_partner_job_14" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">CTO</field>
-            <field name="email">ol@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_laurent0"/>
-        </record>
-        <record id="res_partner_job_15" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">CTO</field>
-            <field name="email">fl@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_lambotte0"/>
-        </record>
-        <record id="res_partner_job_16" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">Salesman</field>
-            <field name="email">av@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_vandewerve0"/>
-        </record>
-        <record id="res_partner_job_17" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">CTO</field>
-            <field name="email">fb@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_semal0"/>
-        </record>
-        <record id="res_partner_job_18" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">CTO</field>
-            <field name="email">qd@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_depaoli0"/>
-        </record>
-        <record id="res_partner_job_19" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">CTO</field>
-            <field name="email">ne@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_elkhayat0"/>
-        </record>
-        <record id="res_partner_job_20" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">CTO</field>
-            <field name="email">ph@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_luu0"/>
-        </record>
-        <record id="res_partner_job_21" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">CEO</field>
-            <field name="email">fp@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_pinckears0"/>
-            <field name="sequence_partner">-1</field>
-        </record>
-        <record id="res_partner_job_22" model="res.partner.job">
-            <field name="address_id" ref="base.main_address"/>
-            <field name="function">Salesman</field>
-            <field name="email">cd@mycompany.com</field>
-            <field name="contact_id" ref="res_partner_contact_debois0"/>
-        </record>
-        <record id="res_partner_job_23" model="res.partner.job">
-            <field name="address_id" ref="res_partner_address_0"/>
-            <field name="contact_id" ref="res_partner_contact_mortier0"/>
-            <field name="sequence_contact">5</field>
-            <field name="function">PA</field>
-        </record>
-        <record id="res_partner_job_24" model="res.partner.job">
-            <field name="sequence_contact">1</field>
-            <field name="address_id" ref="res_partner_address_1"/>
-            <field name="contact_id" ref="res_partner_contact_lacarte0"/>
-            <field name="function">PA</field>
-            <field name="sequence_contact">5</field>
-        </record>
-        <record id="res_partner_job_25" model="res.partner.job">
-            <field name="sequence_contact">2</field>
-            <field name="address_id" ref="base.res_partner_address_1"/>
-            <field name="contact_id" ref="res_partner_contact_lacarte0"/>
-            <field name="function">CEO</field>
-            <field name="sequence_contact">1</field>
-        </record>
-        -->
-    </data>
-</openerp>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
deleted file mode 100644
index 16a9a966e25..00000000000
--- a/addons/base_contact/base_contact_view.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-    <!-- Views for Contacts Tree View -->
-
-    <record model="ir.ui.view" id="view_partner_contact_tree">
-        <field name="name">res.partner.contact.tree</field>
-        <field name="model">res.partner.contact</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Partner Contact">
-                <field name="name"/>
-                <field name="first_name"/>
-                <field name="mobile"/>
-                <field name="email"/>
-                <field name="lang_id"/>
-                <field name="partner_id"/>
-                <field name="function"/>
-            </tree>
-        </field>
-    </record>
-
-<!-- Views for Contacts Form View -->
-
-    <record model="ir.ui.view" id="view_partner_contact_form">
-        <field name="name">res.partner.contact.form</field>
-        <field name="model">res.partner.contact</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Partner Contact">
-                <group colspan="4" col="6">
-                    <field name="last_name" select="1"/>
-                    <field name="first_name" select="1"/>
-                    <field name="title" select="1" widget="selection" domain="[('domain', '=', 'contact')]" size="0"/>
-                </group>
-                <notebook colspan="4" >
-                    <page string="General">
-                       <group colspan="4" col="4">
-                            <group colspan="2" col="4">
-                                <separator string="Personal Information" colspan="4"/>
-                                <field name="mobile"/>
-                                <field name="email"  widget="email"/>
-                                <field name="website"/>
-                            </group>
-                            <group colspan="2" col="1">
-                                <separator string="Photo" colspan="4"/>
-                                <field name="photo" widget='image' nolabel="1"/>
-                            </group>
-                       </group>
-                       <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
-                            <form string="Functions and Addresses">
-                                <field name="partner_id" />
-                                <field name="location_id" domain="[('partner_id', '=', partner_id)]"/>
-                                <field name="function" />
-                                <separator string="Professional Info" colspan="4"/>
-                                <field name="phone"/>
-                                <field name="fax"/>
-                                <field name="email" widget="email"/>
-                            </form>
-                            <tree string="Functions and Addresses">
-                                <field name="location_id"/>
-                                <field name="function"/>
-                                <field name="phone"/>
-                                <field name="email"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Extra Information">
-                        <field name="active"/>
-                        <field name="lang_id" widget="selection"/>
-                        <field name="partner_id" invisible="1" select="1"/>
-                        <field name="function" invisible="1" />
-                        <field name="country_id"/>
-                        <field name="birthdate"/>
-                    </page>
-                    <page string="Notes">
-                        <field name="comment" nolabel="1"/>
-                    </page>
-
-                </notebook>
-            </form>
-        </field>
-    </record>
-
-<!-- Views for Contacts Search View -->
-
-    <record model="ir.ui.view" id="view_partner_contact_search">
-        <field name="name">res.partner.contact.search</field>
-        <field name="model">res.partner.contact</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Partner Contact">
-                <field name="name" string="First/Lastname"
-                    filter_domain="['|', ('first_name','ilike', self), ('last_name', 'ilike', self)]"/>
-                <field name="partner_id" string="Partner"/>
-            </search>
-        </field>
-    </record>
-
-<!-- Views for Contacts Action -->
-
-    <record model="ir.actions.act_window" id="action_partner_contact_form">
-        <field name="name">Contacts</field>
-        <field name="res_model">res.partner.contact</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_partner_contact_tree"/>
-        <field name="search_view_id" ref="view_partner_contact_search"/>
-    </record>
-    <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
-
-    <!-- Rename menuitem for partner addresses -->
-    <record model="ir.ui.menu" id="base.menu_partner_address_form">
-        <field name="name">Addresses</field>
-    </record>
-
-    <!--
-    Contacts for Suppliers
-    -->
-    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
-             sequence="3"/>
-    <menuitem id="base.menu_procurement_management_supplier" name="Address Book"
-            parent="base.menu_purchase_root" sequence="3"/>
-    <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
-            parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
-    <menuitem name="Contacts" id="menu_purchases_partner_contact_form" action="action_partner_contact_form"
-            parent = "base.menu_procurement_management_supplier" sequence="2"/>
-
-    <!-- Views for Partners Form View -->
-
-    <record model="ir.ui.view" id="view_partner_form_inherit">
-        <field name="name">Partner form inherited</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <separator string="Postal Address" position="after">
-                <field name="location_id" on_change="onchange_location_id(location_id)" domain="[('partner_id', '=', parent.id)]"/>
-            </separator>
-            <xpath expr="//field[@string='Contact Name']" position="replace">
-                <field name="contact_id"/>
-            </xpath>
-            <field name="title" position="replace"/>
-        </field>
-    </record>
-
-    <!-- Views for Addresses -->
-
-    <record model="ir.ui.view" id="view_partner_location_form">
-        <field name="name">res.partner.location.form</field>
-        <field name="model">res.partner.location</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Locations">
-                <field name="street" colspan="4"/>
-                <field name="street2" colspan="4"/>
-                <field name="zip"/>
-                <field name="city"/>
-                <field name="country_id" />
-                <field name="state_id"/>
-            </form>
-        </field>
-    </record>
-
-
-    <record model="ir.ui.view" id="view_partner_location_tree">
-        <field name="name">res.partner.location.tree</field>
-        <field name="model">res.partner.location</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Locations">
-                <field name="city"/>
-                <field name="country_id" />
-                <field name="state_id"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_partner_address_form_inherited0">
-        <field name='name'>res.partner.address.form.inherited0</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name="name" position="replace">
-                <field name="contact_id"/>
-            </field>
-            <separator string="Postal Address" position="after">
-                <field name="location_id" on_change="onchange_location_id(location_id)"/>
-            </separator>
-            <field name="title" position="replace"/>
-        </field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/base_contact/i18n/ar.po b/addons/base_contact/i18n/ar.po
deleted file mode 100644
index 56e078eb3c3..00000000000
--- a/addons/base_contact/i18n/ar.po
+++ /dev/null
@@ -1,481 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-12 19:38+0000\n"
-"Last-Translator: amani ali <applepie9911@yahoo.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-13 04:49+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "جهات الاتصال"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "الاسم الأول"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "شريك إلى عنوان"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"اذا كان وضع الحقل النشط خطأ, سيسمح لك بإخفاء اتصال الشريك بدون ازالته."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "الموقع الإلكتروني"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "اللقب"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "جهة الاتصال الأساسية"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "البريد الإلكتروني"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "نشِط"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "الجنسية"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "العنوان البريدي"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "المهمة الرئيسية"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "تعريف الشركاء وعناوينهم"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "الاسم"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "اللغة"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "الجوال"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "ملاحظات"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "أشخاص تعمل معهم."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "معلومات إضافية"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "المهام والعناوين"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "جهة الاتصال"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "الشركات التي تتعامل معها."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "صاحب العمل الرئيسي"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "جهة الاتصال بالشريك"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "العناوين"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "عناوين العمل والعناوين الخاصة"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "اسم العائلة"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "صورة"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "عام"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "الشريك"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "الشركاء"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "عناوين الشريك"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "تاريخ الميلاد"
-
-#~ msgid "Fax"
-#~ msgstr "فاكس"
-
-#~ msgid "# of Contacts"
-#~ msgstr "عدد جهات الاتصال"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr "يمكنك إدخال العنوان أولاً، وسيتمّ ربط الشريك تلقائياً إن وُجِد."
-
-#~ msgid "Job FAX no."
-#~ msgstr "فاكس العمل"
-
-#~ msgid "Status of Address"
-#~ msgstr "حالة العنوان"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "تاريخ الالتحاق بالوظيفة"
-
-#~ msgid "Migrate"
-#~ msgstr "نقل"
-
-#~ msgid "Categories"
-#~ msgstr "الفئات"
-
-#~ msgid "Job Phone no."
-#~ msgstr "هاتف العمل"
-
-#~ msgid "Extension"
-#~ msgstr "الامتداد"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "البريد الإلكتروني للعمل"
-
-#~ msgid "Image"
-#~ msgstr "صورة"
-
-#~ msgid "title"
-#~ msgstr "الاسم"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "حدد الخيار لنقل العناوين"
-
-#~ msgid "Last date of job"
-#~ msgstr "تاريخ ترك الوظيفة"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "الوظائف"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "ترتيب المسمى الوظيفي هذا  حسب الأهمية بين المسميات الوظيغية المستخدمة لدى "
-#~ "الشريك"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "امتداد رقم الهاتف الداخلي/الخارجي"
-
-#~ msgid "Date Stop"
-#~ msgstr "تاريخ التوقف"
-
-#~ msgid "Communication"
-#~ msgstr "التواصل"
-
-#~ msgid "Partner Seq."
-#~ msgstr "رقم الشريك"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "العنوان المرتبط بالشريك"
-
-#~ msgid "Additional phone field"
-#~ msgstr "حقل هاتف إضافي"
-
-#~ msgid "Contact Seq."
-#~ msgstr "رقم جهة الاتصال"
-
-#~ msgid "Phone"
-#~ msgstr "هاتف"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "وإلا فلن تظهر هذه التفاصيل في العنوان/جهة الاتصال."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Configure"
-#~ msgstr "ضبط الإعدادات"
-
-#~ msgid "Seq."
-#~ msgstr "رقم"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "إذا اخترت هذا الخيار، سيتم نقل جميع العناوين."
-
-#~ msgid "Current"
-#~ msgstr "الحالي"
-
-#~ msgid "Main Job"
-#~ msgstr "الوظيفة الرئيسية"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "تعريف جهات الاتصال والمهام."
-
-#~ msgid "Contact to function"
-#~ msgstr "جهة اتصال إلى مهمة"
-
-#~ msgid "Address"
-#~ msgstr "العنوان"
-
-#~ msgid "Other"
-#~ msgstr "غير ذلك"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "ترتيب هذا العنوان حسب الأهمية بين عناوين جهة الاتصال"
-
-#~ msgid "Address Migration"
-#~ msgstr "نقل العنوان"
-
-#~ msgid "Date Start"
-#~ msgstr "تاريخ البدء"
-
-#~ msgid "Open Jobs"
-#~ msgstr "الوظائف المفتوحة"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "يمكنك نقل العناوين الحالية للشريك إلى جهة الاتصال"
-
-#~ msgid "Define functions and address."
-#~ msgstr "تعريف المهام والعنوان"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "مهمة الشريك"
-
-#~ msgid "Partner Function"
-#~ msgstr "مهمة الشريك"
-
-#~ msgid "Contact Functions"
-#~ msgstr "مهام جهة الاتصال"
-
-#~ msgid "Function to address"
-#~ msgstr "مهمة إلى عنوان"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        تمكنك هذه الوحدة البرمجية من إدارة جهات الاتصال بشكل كامل.\n"
-#~ "    فهي تسمح لك بـتعرف:\n"
-#~ "        * جهات اتصال غير ذات صلة بشريك،\n"
-#~ "        * جهات اتصال ذات عناوين عمل متعددة (ربما لارتباطها بشركاء مختلفين)،\n"
-#~ "        * جهات اتصال ذات مهام مختلفة لكل عنوان من عناوين وظائفها\n"
-#~ "\n"
-#~ "    كذلك تضيف هذه الوحدة البرمجية عناصر جديدة إلى القائمة تحت\n"
-#~ "        الشركاء / جهات الاتصال\n"
-#~ "        الشركاء / المهام\n"
-#~ "\n"
-#~ "    تنبه إلى أن هذه الوحدة البرمجية تقوم بتحويل العناوين الموجودة مسبقاً إلى "
-#~ "\"عناوين\" و \"جهات اتصال\"، مما يعني أن بعض حقول العناوين سيتم حذفها (مثل "
-#~ "اسم جهة الاتصال) لأنه من المفترض أن يتم تعريفها في كائن آخر.\n"
-#~ "    "
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "مهمة جهة الاتصال هذه عند هذا الشريك"
-
-#~ msgid "Function"
-#~ msgstr "المهمة"
-
-#~ msgid "Search Contact"
-#~ msgstr "بحث جهة الإتصال"
-
-#~ msgid "State"
-#~ msgstr "المحافظة"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "سير الإعدادات"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "نتيجة للتغيرات في العنوان، وعلاقة الشريك, سيكون هناك الحاجة الى ترحيل بعض "
-#~ "التفاصيل من العنوان الى معلومات الاتصال."
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "الوظائف عند نفس عنوان الشريك."
-
-#~ msgid "Past"
-#~ msgstr "سابق"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "هل تريد ترحيل بيانات عنوانك الى بيانات الاتصال؟"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "ترحيل العنوان الى جهات الاتصالات"
diff --git a/addons/base_contact/i18n/base_contact.pot b/addons/base_contact/i18n/base_contact.pot
deleted file mode 100644
index 6b9f8cb652d..00000000000
--- a/addons/base_contact/i18n/base_contact.pot
+++ /dev/null
@@ -1,261 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid "If the active field is set to False,                 it will allow you to hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
-
diff --git a/addons/base_contact/i18n/bg.po b/addons/base_contact/i18n/bg.po
deleted file mode 100644
index 2a4f82ad61d..00000000000
--- a/addons/base_contact/i18n/bg.po
+++ /dev/null
@@ -1,504 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-03 00:57+0000\n"
-"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Контакти"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Собствено Име"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Партньор на адрес"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Ако полето е настроено на невярно, то се скрива връзка с партньор, без да я "
-"премахва."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Уеб сайт"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Обръщение"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "База контакт"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Имейл"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Активен"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Националност"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Пощенски адрес"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Основна длъжност"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Задаване на партньори и техните адреси."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Име"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Език"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Мобилен"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Бележки"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Хора, с които работите"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Допълнителна информация"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Длъжности и адреси"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Контакт"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Фирми с които работите."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Основен работодател"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Контакт на партньор"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Адреси"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Работни и домашни адреси"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Фамилия"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Снимка"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Общ"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Партньор"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Партньори"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Адрес на партньора"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Дата на раждане"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# контакти"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-#~ "символи!"
-
-#~ msgid "Phone"
-#~ msgstr "Телефон"
-
-#~ msgid "Address"
-#~ msgstr "Адрес"
-
-#~ msgid "Categories"
-#~ msgstr "Категории"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Невалиден XML за преглед на архитектурата"
-
-#~ msgid "General Information"
-#~ msgstr "Обща информация"
-
-#~ msgid "Current"
-#~ msgstr "Текущ"
-
-#~ msgid "Other"
-#~ msgstr "Друго"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Дата на постъпване на работа"
-
-#~ msgid "Fax"
-#~ msgstr "Факс"
-
-#~ msgid "State"
-#~ msgstr "Област"
-
-#~ msgid "Last date of job"
-#~ msgstr "Последен работен ден"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Служебен тел. номер"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Служебен имейл"
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
-
-#~ msgid "Communication"
-#~ msgstr "Комуникация"
-
-#~ msgid "Past"
-#~ msgstr "Предишен"
-
-#~ msgid "Search Contact"
-#~ msgstr "Търсене на контакт"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Допълнително поле за телефон"
-
-#~ msgid "Configure"
-#~ msgstr "Настройване"
-
-#~ msgid "Main Job"
-#~ msgstr "Основна работа"
-
-#~ msgid "Date Start"
-#~ msgstr "Начална дата"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Може първо да въведете адрес, ако има партньор, ще бъде добавен автоматично."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Служ. факс"
-
-#~ msgid "Status of Address"
-#~ msgstr "Състояние на адрес"
-
-#~ msgid "title"
-#~ msgstr "обръщение"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Изберете опция за мигриране на адреси"
-
-#~ msgid "Migrate"
-#~ msgstr "Мигриране"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Длъжности на същия партньорски адрес"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Определение на значението на тази длъжност в списъка на длъжността на "
-#~ "свързан партньор"
-
-#~ msgid "Date Stop"
-#~ msgstr "Дата на спиране"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Вътрешни / Външни допълнителни телефонни номера"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Контакти на работни места"
-
-#~ msgid "Extension"
-#~ msgstr "Разширение"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Прогрес на настройките"
-
-#~ msgid "Function to address"
-#~ msgstr "Длъжност за адрес"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Длъжностна контакта при този партньор"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Определяне на длъжност и адрес"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Този модул ви позволява да управлявате контактите си напълно.\n"
-#~ "\n"
-#~ "Позволява да определит:\n"
-#~ "* контактите не са свързани с партньор,\n"
-#~ "* контакти, работещи в няколко адреса (вероятно за различнит партньори),\n"
-#~ "* контакти с възможно различни длъности за всеки един от адресите си на "
-#~ "работа\n"
-#~ "\n"
-#~ "Той също така добавя нови елементи от менюто, разположени в\n"
-#~ "Партньори \\ Контакти\n"
-#~ "Партньори \\ Длъжности\n"
-#~ "\n"
-#~ "Обърнете внимание, че този модул преобразува съществуващите адреси в "
-#~ "\"адреси + контакти \". Това означава, че някои области от адресите ще "
-#~ "липсват (като името на контакта), тъй като те се очаква да бъдат определени "
-#~ "в един друг обект.\n"
-#~ "    "
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Адрес, свързан с партньора"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Поради промени във връзката Адрес и Партньори, някои от данните от адреса е "
-#~ "необходими за да себъдат прехвърлени в контакт."
-
-#~ msgid "Partner Function"
-#~ msgstr "Длъжност на партньора"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Адрес на преселване за контакти"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Длъжност на контакта"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Искате ли да преместите адресните данни в данни за контакт?"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr ""
-#~ "В противен случай тези данни няма да бъдат видими чрез адрес / контакт."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Seq."
-#~ msgstr "Посл."
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Ако изберете това, всички адреси ще се прехвърлят."
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Определяне на контакти и длъности"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Длъжност на контакта в партньора"
-
-#~ msgid "Contact to function"
-#~ msgstr "Контакт за длъжност"
-
-#~ msgid "Function"
-#~ msgstr "Длъжност"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Определение на значението на този адрес в списъка с адреси на свързаните "
-#~ "контакти"
-
-#~ msgid "Address Migration"
-#~ msgstr "Адрес на преместване"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Отворете работни мяста"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Можете да преместите адреса на  партньора за контакта."
-
-#~ msgid "Partner Seq."
-#~ msgstr "Партньор последов."
-
-#~ msgid "Contact Seq."
-#~ msgstr "Кантакт последов."
diff --git a/addons/base_contact/i18n/bs.po b/addons/base_contact/i18n/bs.po
deleted file mode 100644
index f80a2941cd7..00000000000
--- a/addons/base_contact/i18n/bs.po
+++ /dev/null
@@ -1,266 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-02-03 17:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/base_contact/i18n/ca.po b/addons/base_contact/i18n/ca.po
deleted file mode 100644
index de207328741..00000000000
--- a/addons/base_contact/i18n/ca.po
+++ /dev/null
@@ -1,528 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-03 00:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactes"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Primer nom"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Empresa a adreça"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Si el camp actiu es desmarca, permet ocultar el contacte de l'empresa sense "
-"eliminar-lo."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Lloc web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Títol"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacte base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Email"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Actiu"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalitat"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Adreça postal"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Funció principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Defineix empreses i les seves adreces."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mòbil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notes"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Persones amb qui treballa."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Informació extra"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Càrrecs i adreces"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contacte"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empreses en les que treballa."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Empleat principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacte empresa"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adreces"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Adreces de treball i privades."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Cognoms"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Fotografia"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Empreses"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adreces de l'empresa"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Data naixement"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# de contactes"
-
-#~ msgid "Main Job"
-#~ msgstr "Treball principal"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Seq. contacte"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contacte"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-#~ "especial!"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funció a l'empresa"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Seq. empresa"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Funció contacte a l'empresa"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contacte a càrrec"
-
-#~ msgid "Function"
-#~ msgstr "Funció"
-
-#~ msgid "Phone"
-#~ msgstr "Telèfon"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Defineix contactes i càrrecs."
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funcions contacte"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Ordre d'importància d'aquesta ocupació en la llista d'ocupacions de "
-#~ "l'empresa relacionada"
-
-#~ msgid "Date Stop"
-#~ msgstr "Data finalització"
-
-#~ msgid "Address"
-#~ msgstr "Adreça"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Treballs del contacte"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Ordre d'importància d'aquesta adreça en la llista d'adreces del contacte "
-#~ "relacionat"
-
-#~ msgid "Categories"
-#~ msgstr "Categories"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invàlid per a la definició de la vista!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Procés contacte base"
-
-#~ msgid "Seq."
-#~ msgstr "Seq."
-
-#~ msgid "Function to address"
-#~ msgstr "Càrrec a adreça"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactes de l'empresa"
-
-#~ msgid "State"
-#~ msgstr "Estat"
-
-#~ msgid "Past"
-#~ msgstr "Anterior"
-
-#~ msgid "General Information"
-#~ msgstr "Informació general"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Treballs en la mateixa adreça d'empresa."
-
-#~ msgid "Date Start"
-#~ msgstr "Data inicial"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Defineix càrrecs i adreces."
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Número d'extensió telefònica interior / exterior"
-
-#~ msgid "Extension"
-#~ msgstr "Extensió"
-
-#~ msgid "Other"
-#~ msgstr "Un altre"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Camp per telèfon addicional"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de model no vàlid en la definició de l'acció."
-
-#~ msgid "Migrate"
-#~ msgstr "Migra"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Funció d'aquest contacte amb aquesta empresa."
-
-#~ msgid "title"
-#~ msgstr "títol"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Data inicial del treball (data d'unió)."
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Seleccioneu l'opció per a la migració d'adreces"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Número de telèfon del treball."
-
-#~ msgid "Image"
-#~ msgstr "Imatge"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicació"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Ordre d'importància d'aquest títol de treball en la llista de títols de "
-#~ "treballs de l'empresa relacionada."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progrés de la configuració"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migració d'adreces a contactes"
-
-#~ msgid "Search Contact"
-#~ msgstr "Cerca contacte"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contacte.instal·lador"
-
-#~ msgid "Configure"
-#~ msgstr "Configura"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Treballs oberts"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Podeu migrar les adreces actuals de l'empresa al contacte."
-
-#~ msgid "Address Migration"
-#~ msgstr "Migració d'adreces"
-
-#~ msgid "Status of Address"
-#~ msgstr "Estat de l'adreça"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Podeu introduir primer una adreça, es relacionarà automàticament amb "
-#~ "l'empresa si n'hi ha."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Número del fax del treball."
-
-#~ msgid "Last date of job"
-#~ msgstr "Data final del treball"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Correu electrònic del treball"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Aquest mòdul us permet gestionar els contactes de forma completa.\n"
-#~ "\n"
-#~ "    Us permet definir:\n"
-#~ "        contactes sense cap relació amb una empresa,\n"
-#~ "        contactes que treballen en diverses adreces (probablement per a "
-#~ "diferents empreses),\n"
-#~ "        contactes amb diverses funcions per a cadascuna de les seves adreces "
-#~ "de treball\n"
-#~ "\n"
-#~ "    També afegeix noves entrades de menús localitzades en:\n"
-#~ "        Empreses \\ Contactes\n"
-#~ "        Empreses \\ Funcions\n"
-#~ "\n"
-#~ "    Aneu amb compte que aquest mòdul converteix les adreces existents en "
-#~ "\"adreces + contactes\". Això significa que alguns camps de les adreces "
-#~ "desapareixeran (com ara el nom del contacte), ja que se suposa que estaran "
-#~ "definides en un altre objecte.\n"
-#~ "    "
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Si no aquests detalls no seran visibles des d'adreces/contactes."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adreça que està relacionada amb l'empresa"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "A causa dels canvis en la relació entre Adreces i Empreses, alguns dels "
-#~ "detalls de les adreces cal migrar-los a la informació de contactes."
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Voleu migrar les dades de les adreces a les dades de contacte?"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Si seleccioneu aquesta opció, totes les adreces es migraran."
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Ordre d'importància d'aquesta adreça en la llista d'adreces del contacte "
-#~ "relacionat"
diff --git a/addons/base_contact/i18n/cs.po b/addons/base_contact/i18n/cs.po
deleted file mode 100644
index 066ff39e968..00000000000
--- a/addons/base_contact/i18n/cs.po
+++ /dev/null
@@ -1,501 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-11-25 12:34+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
-"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net >\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:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-"X-Poedit-Language: Czech\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakty"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Křestní jméno"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partner na adresu"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Pokud je aktivní pole nastaveno na Nepravda,               umožní vám to "
-"skrýt kontakt partnera bez jeho odstranění."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Webová stránka"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Název"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Základní kontakt"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktivní"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Národnost"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Poštovní adresa"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Hlavní funkce"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Určuje partnery a jejich adresy."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Jméno"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Jazyk"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Poznámky"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Lidé, s kterými pracujete."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Speciální informace"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funkce a adresy"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Společnosti, se kterými pracujete."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Hlavní zaměstnavatel"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Kontakt partnera"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adresy"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Pracovní a soukromé adresy."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Příjmení"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Fotka"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Obecný"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partneři"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adresy partnerů"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Datum narození"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorie"
-
-#~ msgid "Current"
-#~ msgstr "Stávající"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Address"
-#~ msgstr "Adresa"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalidní XML pro zobrazení architektury!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Špatný název modelu v definici akce"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Kontaktní funkce"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Function"
-#~ msgstr "Funkce"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# z kontaktů"
-
-#~ msgid "title"
-#~ msgstr "nadpis"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Datum zahájení práce (datum připojení)"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Vyberte volbu pro přesun adres"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Funkce tohoto kontaktu s tímto partnerem"
-
-#~ msgid "Status of Address"
-#~ msgstr "Stav adresy"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Můžete                       zadat nejdříve adresu. Pokud je nějaký partner, "
-#~ "bude napojen automaticky."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Číslo FAXu do práce"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Určit funkce a adresu."
-
-#~ msgid "Last date of job"
-#~ msgstr "Poslední datum práce"
-
-#~ msgid "Migrate"
-#~ msgstr "Přesunout"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Pracovní pozice u stejné adresy partnera."
-
-#~ msgid "State"
-#~ msgstr "Stav"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Tento modul umožňuje úplně spravovat vaše kontakty.\n"
-#~ "\n"
-#~ "    Nechá vás určit\n"
-#~ "        *kontakty nevztažené k partnerovi,\n"
-#~ "        *kontakty pracující na několika adresách (případně i pro různé "
-#~ "partnery),\n"
-#~ "        *kontakty s možnými různými funkcemi pro každou jeho pracovní "
-#~ "adresu\n"
-#~ "\n"
-#~ "    Také přidává nové položky nabídky umístěné v\n"
-#~ "        Partneři \\ Kontakty\n"
-#~ "        Partneři \\ Funkce\n"
-#~ "\n"
-#~ "    Berte na vědomí, že tento modul převádí existující adresy na \"adresy + "
-#~ "kontakty\". To znamená, že některé pole adres budou chybět (jako jméno "
-#~ "kontaktu), protože ty jsou definovány v jiném objektu.\n"
-#~ "    "
-
-#~ msgid "Date Stop"
-#~ msgstr "Datum zastavení"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Pozice kontaktu"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Pořadí důležitosti                     této pracovní pozice v seznamu titulů "
-#~ "pozic napojeného partnera"
-
-#~ msgid "Extension"
-#~ msgstr "Rozšíření"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Vnitřní/vnější telefoní číslo klapky"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Telefoní číslo do práce."
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Pracovní E-Mail"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Poř. parnera"
-
-#~ msgid "Function to address"
-#~ msgstr "Funkce na adresu"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Průběh nastavení"
-
-#~ msgid "Communication"
-#~ msgstr "Komunikace"
-
-#~ msgid "Image"
-#~ msgstr "Obrázek"
-
-#~ msgid "Past"
-#~ msgstr "Minulý"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Stěhování adresy na kontakty"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Poř. kontaktu"
-
-#~ msgid "Search Contact"
-#~ msgstr "Hledat kontakt"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Kvůli změnám v adrese a vztahu partnera, některé podrobnosti adresy jsou "
-#~ "potřebné, aby byly přesunuty do informací účtu."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adresa, která je napojena na partnera"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funkce partnera"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Doplňující pole telefonu"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Jinak tyto podrobnosti nebudou viditelné z adresy/kontaktu."
-
-#~ msgid "Configure"
-#~ msgstr "Nastavit"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Chcete stěhovat vaše data adresy v datech kontaktu?"
-
-#~ msgid "Seq."
-#~ msgstr "Poř."
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Pokud toto vyberete, všechny adresy budou přesunuty."
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Kontakt funkce partnera"
-
-#~ msgid "Other"
-#~ msgstr "Jiné"
-
-#~ msgid "Main Job"
-#~ msgstr "Hlavní práce"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Určuje kontakty a funkce."
-
-#~ msgid "Contact to function"
-#~ msgstr "Kontakt na funkci"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Otevřené pozice"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Můžete stěhovat partnerovu aktuální adresu do kontaktu."
-
-#~ msgid "Address Migration"
-#~ msgstr "Stěhování adresy"
-
-#~ msgid "Date Start"
-#~ msgstr "Počáteční datum"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Pořadí podle             důležitosti této adresy v seznamu adres napojeného "
-#~ "kontaktu"
diff --git a/addons/base_contact/i18n/da.po b/addons/base_contact/i18n/da.po
deleted file mode 100644
index 35be51db1ad..00000000000
--- a/addons/base_contact/i18n/da.po
+++ /dev/null
@@ -1,318 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-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: 2011-11-08 22:31+0000\n"
-"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakter"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Fornavn"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Hjemmeside"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Titel"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktive"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nationalitet"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Postadresse"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Primær funktion"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Navn"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Sprog"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Noter"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Ekstra information"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontaktperson"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adresser"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Arbejds- og privat adresse"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Efternavn"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Generelt"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partnere"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partneradresser"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fødselsdato"
-
-#~ msgid "Job FAX no."
-#~ msgstr "Arbejds Fax nr."
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "State"
-#~ msgstr "Delstat"
-
-#~ msgid "Migrate"
-#~ msgstr "Migrer"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorier"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Arbejdstlf."
-
-#~ msgid "Extension"
-#~ msgstr "Lokalnr"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfigurations fremskridt"
-
-#~ msgid "Image"
-#~ msgstr "Billede"
-
-#~ msgid "Communication"
-#~ msgstr "Kommunikation"
-
-#~ msgid "Phone"
-#~ msgstr "Tlf. nr."
-
-#~ msgid "Configure"
-#~ msgstr "Konfigurér"
-
-#~ msgid "Function"
-#~ msgstr "Funktion"
-
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
-#~ msgid "Other"
-#~ msgstr "Andet"
-
-#~ msgid "Date Start"
-#~ msgstr "Startdato"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# kontakter"
diff --git a/addons/base_contact/i18n/de.po b/addons/base_contact/i18n/de.po
deleted file mode 100644
index 287e0825482..00000000000
--- a/addons/base_contact/i18n/de.po
+++ /dev/null
@@ -1,527 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-13 19:52+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "Ort"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr "Vor/Nachname"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakte"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr "Professionelle INformation"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Vorname"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr "Adresse"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Anschreiben Partner"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Wenn dieses Feld deaktiviert wird, kann der Partnerkontakt  ausgeblendet "
-"werden."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Website"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "PLZ"
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr "Bundesstaat"
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "Unternehmen"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Partner Titel"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr "Haupt Partner"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Basis Kontakt"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktiv"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nationalität"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Postal. Anschrift"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Haupt Funktion"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "definiere Partner und Anschrift"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Bezeichnung"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Sprache"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "Staat"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Bemerkungen"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Personen Team"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Extra Information"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Aufgabenbereiche und Adressen"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr "res.partner.location"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Kooperationspartner"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Arbeitgeber"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Kontakt bei Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Partner Anschriften"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Arbeitgeber- und Privatadresse"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Nachname"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Photo"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr "Standorte"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Allgemein"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "Straße"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partner Adressen"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr "Straße 2"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "Persönliche Information"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Geburtsdatum"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partner Seq."
-
-#~ msgid "Contact Seq."
-#~ msgstr "Kontakt Seq."
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-#~ "beinhalten"
-
-#~ msgid "Current"
-#~ msgstr "Aktuell"
-
-#~ msgid "Contact to function"
-#~ msgstr "Kontaktdaten"
-
-#~ msgid "Phone"
-#~ msgstr "Tel"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Definieren Kontakte und Funktionen"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr "Wichtigkeit der Anschriften in der Adressliste des Partners"
-
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "Wichtigkeit der Anschriften in der Adressliste des Kontakts"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorien"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Basis Kontakt Prozess"
-
-#~ msgid "Seq."
-#~ msgstr "Seq."
-
-#~ msgid "Function to address"
-#~ msgstr "Zu kontaktieren"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Ansprechpartner"
-
-#~ msgid "State"
-#~ msgstr "Status"
-
-#~ msgid "Past"
-#~ msgstr "Vergangenheit"
-
-#~ msgid "General Information"
-#~ msgstr "Grundinformation"
-
-#~ msgid "Date Start"
-#~ msgstr "gültig von"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definiere Funktion und Adresse"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "interne/externe Durchwahl"
-
-#~ msgid "Extension"
-#~ msgstr "Durchwahl"
-
-#~ msgid "Other"
-#~ msgstr "Anderes"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# Kontakte"
-
-#~ msgid "Main Job"
-#~ msgstr "Haupt-Beruf"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Beschäftigt seit"
-
-#~ msgid "Status of Address"
-#~ msgstr "Status der Adresse"
-
-#~ msgid "Job FAX no."
-#~ msgstr "Arbeit Fax"
-
-#~ msgid "Last date of job"
-#~ msgstr "Beschäftigt Bis"
-
-#~ msgid "Migrate"
-#~ msgstr "Migration"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Beschäftigt an derselben Adresse"
-
-#~ msgid "Date Stop"
-#~ msgstr "Beschäftigt Bis"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Arbeit Tel. Nr."
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Arbeit E-Mail"
-
-#~ msgid "Communication"
-#~ msgstr "Kommunikation"
-
-#~ msgid "Image"
-#~ msgstr "Bild"
-
-#~ msgid "Search Contact"
-#~ msgstr "Suche Ansprechpartner"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Aufgrund technischer Änderungen bei der Datenbeziehung von Adresse zu "
-#~ "Partner, müssen einige Details der Adressdaten zu den Kontaktdaten migriert "
-#~ "werden."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adresse beim Partner"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Zusätzliche Telefon Nr."
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr ""
-#~ "Ansonsten sind diese Detaildaten nicht über die Kontakte und Adressen "
-#~ "ersichtlich."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Fortschritt Konfiguration"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Möchten Sie die Adressdaten zum Kontakt übernehmen?"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Wenn Sie diese Option wählen, werden alle Adressen migriert."
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Kontakt Partner Aufgabenbereich"
-
-#~ msgid "Function"
-#~ msgstr "Aufgabenbereich"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Offene Stellen"
-
-#~ msgid "Address Migration"
-#~ msgstr "Adresse Migration"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "Wichtigkeit der Anschriften in der Adressliste des Kontakts"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Funktion des Ansprechpartners beim Partner"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Sie könnten zuerst die Adresse eingeben, der Partner wird dann automatisch "
-#~ "verlinkt, wenn er existiert."
-
-#~ msgid "Partner Function"
-#~ msgstr "Funktion bei Partner"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Funktion des Ansprechpartners"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Priorität bei der Anzeige der Funktion der Kontaktperson beim  Partner"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funktion des Kontakts"
-
-#~ msgid "Configure"
-#~ msgstr "Konfigurieren"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Dieses Modul erlaubt Ihnen ein ganzheitliches und zentrales Kontakt- "
-#~ "und Adressdatenmanagement.\n"
-#~ "\n"
-#~ "        Sie können folgende Kontaktdaten definieren:\n"
-#~ "         * Kontakte ohne besonderen Bezug einem Partner,\n"
-#~ "         * Kontakte mit verschiedenen Adressen (möglicherweise bei "
-#~ "verschiedenen Partnern),\n"
-#~ "         * Kontakte mit möglicherweise unterschiedlichen Funktionen (bei "
-#~ "unterschiedlichen Adressen)\n"
-#~ "\n"
-#~ "     Weiterhin werden auch neue Menüpunkte durch das Modul generiert, und "
-#~ "zwar\n"
-#~ "         Partnerverzeichnis \\ Kontakte\n"
-#~ "         Partnerverzeichnis \\ Partner Kontaktanrede\n"
-#~ "\n"
-#~ "     Beachten Sie, dass dieses Modul bereits vorhandene Adressen umwandelt "
-#~ "in \"Adressen + Kontakte\". Dieses bedeutet, \n"
-#~ "     dass einige Felder bei der Adresse fehlen werden (wie z.B. der Namen "
-#~ "des Kontaktpartners), da diese durch den Einsatz\n"
-#~ "     dieses Moduls in einem anderen Objekt zu definieren werden müssen.\n"
-#~ "    "
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Wählen Sie eine Option für die Adressenübernahme"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migration Adressverzeichnis zu Kontaktdaten"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Sie können die aktuelle Partneradresse für den Kontakt übernehmen"
-
-#~ msgid "title"
-#~ msgstr "Titel"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
diff --git a/addons/base_contact/i18n/el.po b/addons/base_contact/i18n/el.po
deleted file mode 100644
index 725357efd37..00000000000
--- a/addons/base_contact/i18n/el.po
+++ /dev/null
@@ -1,486 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-29 09:18+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
-"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-"X-Poedit-Country: GREECE\n"
-"X-Poedit-Language: Greek\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Επαφές"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Όνομα"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Συνεργάτης Διεύθυνσης"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Εάν το ενεργό πεδίο είναι Λάθος(False), σας επιτρέπει να αποκρύψετε την "
-"επαφή συναργάτη χωρίς να την διαγράψετε."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Ιστοσελίδα"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Προσφώνηση"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Κύρια Επαφή"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Ενεργή"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Εθνικότητα"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Διεύθυνση Αποστολής"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Κύρια Λειτουργία"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Ορσμός συνεργατών και των διευθύνσεών τους."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Όνομα"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Γλώσσα"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Κινητό"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Σημειώσεις"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Άνθρωποι που συνεργάζεστε."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Πρόσθετες Πληροφορίες"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Θέσεις και Διευθύνσεις"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Επαφή"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Εταιρείες που συνεργάζεστε."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Κύριος Εργοδότης"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Επαφή Συνεργάτη"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Διευθύνσεις"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Διευθύνσεις εργασίας και προσωπικές"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Επώνυμο"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Φωτογραφία"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Γενικά"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Συνεργάτης"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Συνεργάτες"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Διευθύνσεις Συνεργάτη"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Ημερ/νία Γέννησης"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Ιεράρχ. Επαφής"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Ιεράρχ. Συνεργάτη"
-
-#~ msgid "Current"
-#~ msgstr "Τρέχουσα"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Θέση Επαφής στο Συνεργάτη"
-
-#~ msgid "Contact to function"
-#~ msgstr "Επαφή θέσης"
-
-#~ msgid "Partner Function"
-#~ msgstr "Θέση στο Συνεργάτη"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# Επαφών"
-
-#~ msgid "Function"
-#~ msgstr "Λειτουργία"
-
-#~ msgid "Main Job"
-#~ msgstr "Κύρια Εργασία"
-
-#~ msgid "Phone"
-#~ msgstr "Τηλέφωνο"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Ορίζει τις επαφές και τις θέσεις τους."
-
-#~ msgid "Contact Functions"
-#~ msgstr "Θέσεις Επαφής"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr "Σπουδαιότητα της θέσης στην κατάσταση θέσεων εργασίας του συνεργάτη"
-
-#~ msgid "Date Stop"
-#~ msgstr "Ημερ/νία Αποχώρησης"
-
-#~ msgid "Address"
-#~ msgstr "Διεύθυνση"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Θέσεις Εργασίας Επαφών"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "Σπουδαιότητα της διεύθυνσηςστην κατάσταση διευθύνσεων του συνεργάτη"
-
-#~ msgid "Categories"
-#~ msgstr "Κατηγορίες"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Διαδικασία Κύριας Επαφής"
-
-#~ msgid "Seq."
-#~ msgstr "Ιεράρχ."
-
-#~ msgid "Function to address"
-#~ msgstr "Θέση Διεύθυνσης"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Επαφές Συνεργάτη"
-
-#~ msgid "State"
-#~ msgstr "Κατάσταση"
-
-#~ msgid "Past"
-#~ msgstr "Παρελθούσα"
-
-#~ msgid "General Information"
-#~ msgstr "Γενικές Πληροφορίες"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Θέσεις εργασίας στην ίδια Διεύθυνση συνεργάτη"
-
-#~ msgid "Date Start"
-#~ msgstr "Ημερ/νία Εκκίνησης"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Ορισμός θέσεων και διεύθυνση"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Εσωτερικό/Εξωτερικό νούμερο τηλεφώνου"
-
-#~ msgid "Extension"
-#~ msgstr "Επέκταση"
-
-#~ msgid "Other"
-#~ msgstr "Άλλο"
-
-#~ msgid "Fax"
-#~ msgstr "Φαξ"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Επιπρόσθετο πεδίο τηλεφώνου"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Μπορείες να εισάγεις πρώτα την διεύθυνση, ο Συνεργάτης θα συνδεθεί αυτόματα "
-#~ "εάν υπάρχει."
-
-#~ msgid "Job FAX no."
-#~ msgstr "αρ ΦΑΞ εργασίας"
-
-#~ msgid "Status of Address"
-#~ msgstr "Κατάσταση της διεύθυνσης"
-
-#~ msgid "title"
-#~ msgstr "τίτλος"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Ημερομηνία έναρξης εργασίας"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Αλλιώς οι λεπτομέρεις δεν θα είναι ορατές από διεύθυνση/επαφή"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Διεύθυνση που είναι συνδεδεμένη με τον Συνεργάτη"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "E-mail εργασίας"
-
-#~ msgid "Job Phone no."
-#~ msgstr "αρ. Τηλεφώνου εργασίας"
-
-#~ msgid "Search Contact"
-#~ msgstr "Αναζήτηση Επαφής"
-
-#~ msgid "Image"
-#~ msgstr "Εικόνα"
-
-#~ msgid "Communication"
-#~ msgstr "Επικοινωνία"
-
-#~ msgid "Address Migration"
-#~ msgstr "Μεταφορά Διεύθυνσης"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Θέλεις να μεταφέρεις τα δεδομένα Διεύθυνσης στα δεδομένα Επαφής"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Αν επιλέξεις αυτό, όλες οι διευθύνσεις θα μεταφερθούν"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Πρόοδος Ριθμίσεων"
-
-#~ msgid "Migrate"
-#~ msgstr "Μετάπτωση"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Σχέση της επαφής με τον συνεργάτη"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Λόγω αλλαγών  στην Διεύθυνση και στη σχέση με τον Συνεργάτη, κάποιες "
-#~ "λεπτομέρειες χρειάζονται να μεταφερθούν στις πληροφορίες της επαφής."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Last date of job"
-#~ msgstr "Τελευταία ημερομηνία στη δουλειά"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Ανοιχτές Εργασίες"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Ταξινόμηση σπουδαιότητας αυτής της διεύθυνσης στην λίστα διευθύνσεων της "
-#~ "συνδεδεμένης επαφής"
-
-#~ msgid "Configure"
-#~ msgstr "Παραμετροποίηση"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Επιλέξτε αυτήν την Επιλογή για Μετάπτωση Διευθύνσεων"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr ""
-#~ "Μπορείτε να μεταπτώσετε τις τρέχουσες διεύθυνσεις του Συνεργάτη στην επαφή."
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Μετάπτωση Διευθύνσεων σε Επαφές"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Σειρά σπουδαιότητας αυτού του τίτλου εργασίας στην λίστα τιτλων εργασιω΄ν "
-#~ "του συνδεδεμένου συνεργάτη"
diff --git a/addons/base_contact/i18n/es.po b/addons/base_contact/i18n/es.po
deleted file mode 100644
index 71f6c608d25..00000000000
--- a/addons/base_contact/i18n/es.po
+++ /dev/null
@@ -1,529 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-10 17:25+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:07+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "Ciudad"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr "Nombre / Apellido"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr "Información profesional"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Empresa a dirección"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
-"sin eliminarlo."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sitio web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "Código postal"
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr "Provincia"
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidad"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Dirección postal"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Función principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir empresas y sus direcciones."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Gente con la que trabaja."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Información extra"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Cargos y direcciones"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas en las que trabaja."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Empleado principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto empresa"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Direcciones"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Direcciones de trabajo y privadas."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Apellido"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "Calle"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Empresas"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr "Calle2"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "Información Personal"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fecha nacimiento"
-
-#~ msgid "Main Job"
-#~ msgstr "Trabajo principal"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Sec. contacto"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Partner Function"
-#~ msgstr "Función en empresa"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Sec. empresa"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Función contacto en empresa"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contacto a cargo"
-
-#~ msgid "Function"
-#~ msgstr "Cargo"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Define contactos y cargos."
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funciones contacto"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Orden de importancia de este empleo en la lista de empleos de la empresa "
-#~ "relacionada"
-
-#~ msgid "Date Stop"
-#~ msgstr "Fecha finalización"
-
-#~ msgid "Address"
-#~ msgstr "Dirección"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Trabajos del contacto"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proceso contacto base"
-
-#~ msgid "Seq."
-#~ msgstr "Sec."
-
-#~ msgid "Function to address"
-#~ msgstr "Cargo a dirección"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactos de la empresa"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Past"
-#~ msgstr "Anterior"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Trabajos en la misma dirección de empresa."
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definir cargos y direcciones."
-
-#~ msgid "Extension"
-#~ msgstr "Extensión"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Campo para teléfono adicional"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "# of Contacts"
-#~ msgstr "Número de Contactos"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Número de extensión telefónica interior/exterior"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Orden de importancia de este título de trabajo en la lista de títulos de "
-#~ "trabajo de la empresa relacionada."
-
-#~ msgid "Migrate"
-#~ msgstr "Migrar"
-
-#~ msgid "Status of Address"
-#~ msgstr "Estado de la dirección."
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Puede introducir primero una dirección, se relacionará automáticamente con "
-#~ "la empresa si hay una."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Número del Fax del trabajo."
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Función de este contacto con esta empresa."
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Fecha inicial del trabajo (fecha de unión)."
-
-#~ msgid "Last date of job"
-#~ msgstr "Fecha final del trabajo."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Dirección que está relacionada con la empresa."
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
-#~ "los detalles de las direcciones son necesarios migrarlos a la información de "
-#~ "contactos."
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Correo electrónico del trabajo."
-
-#~ msgid "Job Phone no."
-#~ msgstr "Número de teléfono del trabajo."
-
-#~ msgid "Search Contact"
-#~ msgstr "Buscar contacto"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicación"
-
-#~ msgid "Address Migration"
-#~ msgstr "Migración direcciones"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Abrir trabajos"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso configuración"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contacto.instalador"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado."
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Seleccione la opción para la migración de direcciones"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Puede migrar las direcciones actuales de la empresa al contacto."
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migración de direcciones a contactos"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Este módulo le permite gestionar sus contactos de forma completa.\n"
-#~ "\n"
-#~ "    Le permite definir:\n"
-#~ "        *contactos sin ninguna relación con una empresa,\n"
-#~ "        *contactos que trabajan en varias direcciones (probablemente para "
-#~ "distintas empresas),\n"
-#~ "        *contactos con varias funciones para cada una de sus direcciones de "
-#~ "trabajo\n"
-#~ "\n"
-#~ "    También añade nuevas entradas de menús localizadas en:\n"
-#~ "        Empresas \\ Contactos\n"
-#~ "        Empresas \\ Funciones\n"
-#~ "\n"
-#~ "    Tenga cuidado que este módulo convierte las direcciones existentes en "
-#~ "\"direcciones + contactos\". Esto significa que algunos campos de las "
-#~ "direcciones desaparecerán (como el nombre del contacto), ya que se supone "
-#~ "que estarán definidos en otro objeto.\n"
-#~ "    "
-
-#~ msgid "Date Start"
-#~ msgstr "Fecha inicio"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Si no estos detalles no serán visibles desde direcciones/contactos."
diff --git a/addons/base_contact/i18n/es_AR.po b/addons/base_contact/i18n/es_AR.po
deleted file mode 100644
index bca4b4baece..00000000000
--- a/addons/base_contact/i18n/es_AR.po
+++ /dev/null
@@ -1,384 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-11-28 14:17+0000\n"
-"Last-Translator: Carlos Sebastián Macri - Daycrom <cmacri@daycrom.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Direccion del partner"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sitio web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidad"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Función principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir partners y sus direcciones."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Celular"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Gente con la que trabaja."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Información extra"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funciones y direcciones"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas con las que trabaja."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Empleador principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto del partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Direcciones"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Direcciones de trabajo y privadas."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Apellido"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partners"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fecha de nacimiento"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Función del contacto del partner"
-
-#~ msgid "Partner Function"
-#~ msgstr "Función del partner"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contacto a cargo"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Sec. de contacto"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Sec. del partner"
-
-#~ msgid "Main Job"
-#~ msgstr "Trabajo principal"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Orden de importancia de este cargo en la lista cargos del partner relacionada"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funciones del contacto"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Function"
-#~ msgstr "Función"
-
-#~ msgid "Date Stop"
-#~ msgstr "Fecha de finalización"
-
-#~ msgid "Seq."
-#~ msgstr "Sec."
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Trabajos del contacto"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proceso de contacto base"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para la definición de la vista !"
-
-#~ msgid "Address"
-#~ msgstr "Dirección"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactos del partner"
-
-#~ msgid "Function to address"
-#~ msgstr "Función a dirección"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Trabajos en la misma dirección del partner"
-
-#~ msgid "Past"
-#~ msgstr "Anterior"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definir funciones y direcciones."
-
-#~ msgid "Date Start"
-#~ msgstr "Fecha de inicio"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Define contactos y funciones"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# de contactos"
-
-#~ msgid "Extension"
-#~ msgstr "Extensión"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Número de extensión telefónica interior / exterior"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Campo para teléfono adicional"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo inválido en la definición de la acción."
diff --git a/addons/base_contact/i18n/es_CR.po b/addons/base_contact/i18n/es_CR.po
deleted file mode 100644
index 26ee1c57383..00000000000
--- a/addons/base_contact/i18n/es_CR.po
+++ /dev/null
@@ -1,530 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 16:53+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-16 05:05+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-"Language: \n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "Ciudad"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr "Nombre / Apellido"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr "Información profesional"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr "Ubicación"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Empresa a dirección"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
-"sin eliminarlo."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sitio web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "Código postal"
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr "Provincia"
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr "Socio Principal"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidad"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Dirección postal"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Función principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir empresas y sus direcciones."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Gente con la que trabaja."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Información extra"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Cargos y direcciones"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr "res.partner.location"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas en las que trabaja."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Empleado principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto empresa"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Direcciones"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Direcciones de trabajo y privadas."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Apellido"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr "Ubicaciones"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "Calle"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Empresas"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr "Calle2"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "Información Personal"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fecha nacimiento"
-
-#~ msgid "Main Job"
-#~ msgstr "Trabajo principal"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Sec. contacto"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Partner Function"
-#~ msgstr "Función en empresa"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Sec. empresa"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Función contacto en empresa"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contacto a cargo"
-
-#~ msgid "Function"
-#~ msgstr "Cargo"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Define contactos y cargos."
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funciones contacto"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Orden de importancia de este empleo en la lista de empleos de la empresa "
-#~ "relacionada"
-
-#~ msgid "Date Stop"
-#~ msgstr "Fecha finalización"
-
-#~ msgid "Address"
-#~ msgstr "Dirección"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Trabajos del contacto"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proceso contacto base"
-
-#~ msgid "Seq."
-#~ msgstr "Sec."
-
-#~ msgid "Function to address"
-#~ msgstr "Cargo a dirección"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactos de la empresa"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Past"
-#~ msgstr "Anterior"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Trabajos en la misma dirección de empresa."
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definir cargos y direcciones."
-
-#~ msgid "Extension"
-#~ msgstr "Extensión"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Campo para teléfono adicional"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "# of Contacts"
-#~ msgstr "Número de Contactos"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Número de extensión telefónica interior/exterior"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Orden de importancia de este título de trabajo en la lista de títulos de "
-#~ "trabajo de la empresa relacionada."
-
-#~ msgid "Migrate"
-#~ msgstr "Migrar"
-
-#~ msgid "Status of Address"
-#~ msgstr "Estado de la dirección."
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Puede introducir primero una dirección, se relacionará automáticamente con "
-#~ "la empresa si hay una."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Número del Fax del trabajo."
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Función de este contacto con esta empresa."
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Fecha inicial del trabajo (fecha de unión)."
-
-#~ msgid "Last date of job"
-#~ msgstr "Fecha final del trabajo."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Dirección que está relacionada con la empresa."
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
-#~ "los detalles de las direcciones son necesarios migrarlos a la información de "
-#~ "contactos."
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Correo electrónico del trabajo."
-
-#~ msgid "Job Phone no."
-#~ msgstr "Número de teléfono del trabajo."
-
-#~ msgid "Search Contact"
-#~ msgstr "Buscar contacto"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicación"
-
-#~ msgid "Address Migration"
-#~ msgstr "Migración direcciones"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Abrir trabajos"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso configuración"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contacto.instalador"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado."
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Seleccione la opción para la migración de direcciones"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Puede migrar las direcciones actuales de la empresa al contacto."
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migración de direcciones a contactos"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Este módulo le permite gestionar sus contactos de forma completa.\n"
-#~ "\n"
-#~ "    Le permite definir:\n"
-#~ "        *contactos sin ninguna relación con una empresa,\n"
-#~ "        *contactos que trabajan en varias direcciones (probablemente para "
-#~ "distintas empresas),\n"
-#~ "        *contactos con varias funciones para cada una de sus direcciones de "
-#~ "trabajo\n"
-#~ "\n"
-#~ "    También añade nuevas entradas de menús localizadas en:\n"
-#~ "        Empresas \\ Contactos\n"
-#~ "        Empresas \\ Funciones\n"
-#~ "\n"
-#~ "    Tenga cuidado que este módulo convierte las direcciones existentes en "
-#~ "\"direcciones + contactos\". Esto significa que algunos campos de las "
-#~ "direcciones desaparecerán (como el nombre del contacto), ya que se supone "
-#~ "que estarán definidos en otro objeto.\n"
-#~ "    "
-
-#~ msgid "Date Start"
-#~ msgstr "Fecha inicio"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Si no estos detalles no serán visibles desde direcciones/contactos."
diff --git a/addons/base_contact/i18n/es_EC.po b/addons/base_contact/i18n/es_EC.po
deleted file mode 100644
index 9a59caec7e2..00000000000
--- a/addons/base_contact/i18n/es_EC.po
+++ /dev/null
@@ -1,529 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-09-17 19:08+0000\n"
-"Last-Translator: Paco Molinero <paco@byasl.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Empresa a dirección"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
-"sin eliminarlo."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sitio web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidad"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Dirección postal"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Función principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir empresas y sus direcciones."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Gente con la que trabaja."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Información extra"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Cargos y direcciones"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas en las que trabaja."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Empleado principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto empresa"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Direcciones"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Direcciones de trabajo y privadas."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Apellido"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Empresas"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fecha nacimiento"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Sec. contacto"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Partner Function"
-#~ msgstr "Función en empresa"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Sec. empresa"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Función contacto en empresa"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contacto a cargo"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "# of Contacts"
-#~ msgstr "Número de Contactos"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Campo para teléfono adicional"
-
-#~ msgid "Function"
-#~ msgstr "Cargo"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Define contactos y cargos."
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funciones contacto"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Orden de importancia de este empleo en la lista de empleos de la empresa "
-#~ "relacionada"
-
-#~ msgid "Date Stop"
-#~ msgstr "Fecha finalización"
-
-#~ msgid "Address"
-#~ msgstr "Dirección"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Trabajos del contacto"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado"
-
-#~ msgid "Main Job"
-#~ msgstr "Trabajo principal"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proceso contacto base"
-
-#~ msgid "Seq."
-#~ msgstr "Sec."
-
-#~ msgid "Extension"
-#~ msgstr "Extensión"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Número de extensión telefónica interior/exterior"
-
-#~ msgid "Function to address"
-#~ msgstr "Cargo a dirección"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactos de la empresa"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Past"
-#~ msgstr "Anterior"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Trabajos en la misma dirección de empresa."
-
-#~ msgid "Date Start"
-#~ msgstr "Fecha de inicio"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definir cargos y direcciones."
-
-#~ msgid "Migrate"
-#~ msgstr "Migrar"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Puede introducir primero una dirección, se relacionará automáticamente con "
-#~ "la empresa si hay una."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Número del Fax del trabajo."
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Función de este contacto con esta empresa."
-
-#~ msgid "Status of Address"
-#~ msgstr "Estado de la dirección."
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Fecha inicial del trabajo (fecha de unión)."
-
-#~ msgid "Last date of job"
-#~ msgstr "Fecha final del trabajo."
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Seleccione la opción para la migración de direcciones"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migración de direcciones a contactos"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Correo electrónico del trabajo."
-
-#~ msgid "Job Phone no."
-#~ msgstr "Número de teléfono del trabajo."
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Orden de importancia de este título de trabajo en la lista de títulos de "
-#~ "trabajo de la empresa relacionada."
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicación"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Este módulo le permite gestionar sus contactos de forma completa.\n"
-#~ "\n"
-#~ "    Le permite definir:\n"
-#~ "        *contactos sin ninguna relación con una empresa,\n"
-#~ "        *contactos que trabajan en varias direcciones (probablemente para "
-#~ "distintas empresas),\n"
-#~ "        *contactos con varias funciones para cada una de sus direcciones de "
-#~ "trabajo\n"
-#~ "\n"
-#~ "    También añade nuevas entradas de menús localizadas en:\n"
-#~ "        Empresas \\ Contactos\n"
-#~ "        Empresas \\ Funciones\n"
-#~ "\n"
-#~ "    Tenga cuidado que este módulo convierte las direcciones existentes en "
-#~ "\"direcciones + contactos\". Esto significa que algunos campos de las "
-#~ "direcciones desaparecerán (como el nombre del contacto), ya que se supone "
-#~ "que estarán definidos en otro objeto.\n"
-#~ "    "
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de configuración"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Sino estos detalles no serán visibles desde direcciones/contactos."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Dirección que está relacionada con la empresa."
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
-#~ "los detalles de las direcciones son necesarios migrarlos a la información de "
-#~ "contactos."
-
-#~ msgid "Search Contact"
-#~ msgstr "Buscar contacto"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Abrir trabajos"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "Instalador de Módulo de Contactos"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Puede migrar las direcciones actuales de la empresa al contacto."
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado."
-
-#~ msgid "Address Migration"
-#~ msgstr "Migración direcciones"
diff --git a/addons/base_contact/i18n/es_MX.po b/addons/base_contact/i18n/es_MX.po
deleted file mode 100644
index b52490050ce..00000000000
--- a/addons/base_contact/i18n/es_MX.po
+++ /dev/null
@@ -1,582 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-28 08:39+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:09+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "# of Contacts"
-msgstr "Número de Contactos"
-
-#. module: base_contact
-#: field:res.partner.job,fax:0
-msgid "Fax"
-msgstr "Fax"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: base_contact
-#: help:res.partner.job,date_start:0
-msgid "Start date of job(Joining Date)"
-msgstr "Fecha inicial del trabajo (fecha de unión)."
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Select the Option for Addresses Migration"
-msgstr "Seleccione la opción para la migración de direcciones"
-
-#. module: base_contact
-#: help:res.partner.job,function:0
-msgid "Function of this contact with this partner"
-msgstr "Función de este contacto con esta empresa."
-
-#. module: base_contact
-#: help:res.partner.job,state:0
-msgid "Status of Address"
-msgstr "Estado de la dirección."
-
-#. module: base_contact
-#: help:res.partner.job,name:0
-msgid ""
-"You may                     enter Address first,Partner will be linked "
-"automatically if any."
-msgstr ""
-"Puede introducir primero una dirección, se relacionará automáticamente con "
-"la empresa si hay una."
-
-#. module: base_contact
-#: help:res.partner.job,fax:0
-msgid "Job FAX no."
-msgstr "Número del Fax del trabajo."
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Gente con la que trabaja."
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
-msgid "Define functions and address."
-msgstr "Definir cargos y direcciones."
-
-#. module: base_contact
-#: help:res.partner.job,date_stop:0
-msgid "Last date of job"
-msgstr "Fecha final del trabajo."
-
-#. module: base_contact
-#: view:base.contact.installer:0
-#: field:base.contact.installer,migrate:0
-msgid "Migrate"
-msgstr "Migrar"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.job,name:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_function0
-msgid "Jobs at a same partner address."
-msgstr "Trabajos en la misma dirección de empresa."
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Empresas"
-
-#. module: base_contact
-#: field:res.partner.job,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
-"sin eliminarlo."
-
-#. module: base_contact
-#: model:ir.module.module,description:base_contact.module_meta_information
-msgid ""
-"\n"
-"        This module allows you to manage your contacts entirely.\n"
-"\n"
-"    It lets you define\n"
-"        *contacts unrelated to a partner,\n"
-"        *contacts working at several addresses (possibly for different "
-"partners),\n"
-"        *contacts with possibly different functions for each of its job's "
-"addresses\n"
-"\n"
-"    It also adds new menu items located in\n"
-"        Partners \\ Contacts\n"
-"        Partners \\ Functions\n"
-"\n"
-"    Pay attention that this module converts the existing addresses into "
-"\"addresses + contacts\". It means that some fields of the addresses will be "
-"missing (like the contact name), since these are supposed to be defined in "
-"an other object.\n"
-"    "
-msgstr ""
-"\n"
-"        Este módulo le permite gestionar sus contactos de forma completa.\n"
-"\n"
-"    Le permite definir:\n"
-"        *contactos sin ninguna relación con una empresa,\n"
-"        *contactos que trabajan en varias direcciones (probablemente para "
-"distintas empresas),\n"
-"        *contactos con varias funciones para cada una de sus direcciones de "
-"trabajo\n"
-"\n"
-"    También añade nuevas entradas de menús localizadas en:\n"
-"        Empresas \\ Contactos\n"
-"        Empresas \\ Funciones\n"
-"\n"
-"    Tenga cuidado que este módulo convierte las direcciones existentes en "
-"\"direcciones + contactos\". Esto significa que algunos campos de las "
-"direcciones desaparecerán (como el nombre del contacto), ya que se supone "
-"que estarán definidos en otro objeto.\n"
-"    "
-
-#. module: base_contact
-#: model:ir.module.module,shortdesc:base_contact.module_meta_information
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.job,date_stop:0
-msgid "Date Stop"
-msgstr "Fecha finalización"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
-msgid "Contact's Jobs"
-msgstr "Trabajos del contacto"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Categories"
-msgstr "Categorías"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_partner:0
-msgid ""
-"Order of importance                 of this job title in the list of job "
-"title of the linked partner"
-msgstr ""
-"Orden de importancia de este título de trabajo en la lista de títulos de "
-"trabajo de la empresa relacionada."
-
-#. module: base_contact
-#: field:res.partner.job,extension:0
-msgid "Extension"
-msgstr "Extensión"
-
-#. module: base_contact
-#: help:res.partner.job,extension:0
-msgid "Internal/External extension phone number"
-msgstr "Número de extensión telefónica interior/exterior"
-
-#. module: base_contact
-#: help:res.partner.job,phone:0
-msgid "Job Phone no."
-msgstr "Número de teléfono del trabajo."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Cargos y direcciones"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.job,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: help:res.partner.job,email:0
-msgid "Job E-Mail"
-msgstr "Correo electrónico del trabajo."
-
-#. module: base_contact
-#: field:res.partner.job,sequence_partner:0
-msgid "Partner Seq."
-msgstr "Sec. empresa"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
-msgid "Function to address"
-msgstr "Cargo a dirección"
-
-#. module: base_contact
-#: field:base.contact.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Last Name"
-msgstr "Apellido"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.contact:0
-msgid "Communication"
-msgstr "Comunicación"
-
-#. module: base_contact
-#: field:base.contact.installer,config_logo:0
-#: field:res.partner.contact,photo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Past"
-msgstr "Anterior"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Address's Migration to Contacts"
-msgstr "Migración de direcciones a contactos"
-
-#. module: base_contact
-#: field:res.partner.job,sequence_contact:0
-msgid "Contact Seq."
-msgstr "Sec. contacto"
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "Search Contact"
-msgstr "Buscar contacto"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: view:res.partner:0
-#: field:res.partner.address,job_ids:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid ""
-"Due to changes in Address and Partner's relation, some of the details from "
-"address are needed to be migrated into contact information."
-msgstr ""
-"Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
-"los detalles de las direcciones son necesarios migrarlos a la información de "
-"contactos."
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Direcciones de trabajo y privadas."
-
-#. module: base_contact
-#: help:res.partner.job,address_id:0
-msgid "Address which is linked to the Partner"
-msgstr "Dirección que está relacionada con la empresa."
-
-#. module: base_contact
-#: field:res.partner.job,function:0
-msgid "Partner Function"
-msgstr "Función en empresa"
-
-#. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr "Campo para teléfono adicional"
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sitio web"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Otherwise these details will not be visible from address/contact."
-msgstr "Si no estos detalles no serán visibles desde direcciones/contactos."
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-#: field:res.partner.job,email:0
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_base_contact_installer
-msgid "base.contact.installer"
-msgstr "base.contacto.instalador"
-
-#. module: base_contact
-#: view:res.partner.job:0
-msgid "Contact Functions"
-msgstr "Funciones contacto"
-
-#. module: base_contact
-#: field:res.partner.job,phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Función principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir empresas y sus direcciones."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Seq."
-msgstr "Sec."
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Información extra"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas en las que trabaja."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto empresa"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fecha nacimiento"
-
-#. module: base_contact
-#: help:base.contact.installer,migrate:0
-msgid "If you select this, all addresses will be migrated."
-msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_job
-msgid "Contact Partner Function"
-msgstr "Función contacto en empresa"
-
-#. module: base_contact
-#: field:res.partner.job,other:0
-msgid "Other"
-msgstr "Otro"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_function0
-msgid "Function"
-msgstr "Cargo"
-
-#. module: base_contact
-#: field:res.partner.address,job_id:0
-#: field:res.partner.contact,job_id:0
-msgid "Main Job"
-msgstr "Trabajo principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_contacttofunction0
-msgid "Defines contacts and functions."
-msgstr "Define contactos y cargos."
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_contacttofunction0
-msgid "Contact to function"
-msgstr "Contacto a cargo"
-
-#. module: base_contact
-#: view:res.partner:0
-#: field:res.partner.job,address_id:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidad"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
-msgid "Open Jobs"
-msgstr "Abrir trabajos"
-
-#. module: base_contact
-#: field:base.contact.installer,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "You can migrate Partner's current addresses to the contact."
-msgstr "Puede migrar las direcciones actuales de la empresa al contacto."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Empleado principal"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
-msgid "Address Migration"
-msgstr "Migración direcciones"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Postal Address"
-msgstr "Dirección postal"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-#: view:res.partner:0
-msgid "Addresses"
-msgstr "Direcciones"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Empresa a dirección"
-
-#. module: base_contact
-#: field:res.partner.job,date_start:0
-msgid "Date Start"
-msgstr "Fecha inicio"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_contact:0
-msgid ""
-"Order of                     importance of this address in the list of "
-"addresses of the linked contact"
-msgstr ""
-"Orden de importancia de esta dirección en la lista de direcciones del "
-"contacto relacionado."
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Orden de importancia de este empleo en la lista de empleos de la empresa "
-#~ "relacionada"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proceso contacto base"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactos de la empresa"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/base_contact/i18n/es_PY.po b/addons/base_contact/i18n/es_PY.po
deleted file mode 100644
index 9e7a7c4d3f0..00000000000
--- a/addons/base_contact/i18n/es_PY.po
+++ /dev/null
@@ -1,492 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-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: 2011-03-08 17:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@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:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Socio a dirección"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
-"sin eliminarlo."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sitio web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidad"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Dirección postal"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Función principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir socio y sus direcciones."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Celular"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Gente con la que trabaja."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Información extra"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Cargos y direcciones"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Empleado principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Direcciones"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Direcciones de trabajo y privadas."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Apellido"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Socio"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Empresas"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de Socio"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fecha de nacimiento"
-
-#~ msgid "# of Contacts"
-#~ msgstr "Número de Contactos"
-
-#~ msgid "Job FAX no."
-#~ msgstr "Número del Fax del trabajo."
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Puede introducir primero una dirección, se relacionará automáticamente con "
-#~ "la empresa si hay una."
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Función de este contacto con esta empresa."
-
-#~ msgid "Status of Address"
-#~ msgstr "Estado de la dirección."
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Fecha inicial del trabajo (fecha de unión)."
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Seleccione la opción para la migración de direcciones"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definir cargos y direcciones."
-
-#~ msgid "Migrate"
-#~ msgstr "Migrar"
-
-#~ msgid "State"
-#~ msgstr "Departamento"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Trabajos en la misma dirección de empresa."
-
-#~ msgid "Last date of job"
-#~ msgstr "Fecha final del trabajo."
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Trabajos del contacto"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Número de teléfono del trabajo."
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Orden de importancia de este título de trabajo en la lista de títulos de "
-#~ "trabajo de la empresa relacionada."
-
-#~ msgid "Date Stop"
-#~ msgstr "Fecha final"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Este módulo le permite gestionar sus contactos de forma completa.\n"
-#~ "\n"
-#~ "    Le permite definir:\n"
-#~ "        *contactos sin ninguna relación con una empresa,\n"
-#~ "        *contactos que trabajan en varias direcciones (probablemente para "
-#~ "distintas empresas),\n"
-#~ "        *contactos con varias funciones para cada una de sus direcciones de "
-#~ "trabajo\n"
-#~ "\n"
-#~ "    También añade nuevas entradas de menús localizadas en:\n"
-#~ "        Empresas \\ Contactos\n"
-#~ "        Empresas \\ Funciones\n"
-#~ "\n"
-#~ "    Tenga cuidado que este módulo convierte las direcciones existentes en "
-#~ "\"direcciones + contactos\". Esto significa que algunos campos de las "
-#~ "direcciones desaparecerán (como el nombre del contacto), ya que se supone "
-#~ "que estarán definidos en otro objeto.\n"
-#~ "    "
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Número de extensión telefónica interior/exterior"
-
-#~ msgid "Extension"
-#~ msgstr "Extensión"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de la configuración"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Correo electrónico del trabajo."
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicación"
-
-#~ msgid "Function to address"
-#~ msgstr "Cargo a dirección"
-
-#~ msgid "Past"
-#~ msgstr "Anterior"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Sec. socio"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Dirección que está relacionada con la empresa."
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
-#~ "los detalles de las direcciones son necesarios migrarlos a la información de "
-#~ "contactos."
-
-#~ msgid "Partner Function"
-#~ msgstr "Función del socio"
-
-#~ msgid "Search Contact"
-#~ msgstr "Buscar contacto"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Campo para teléfono adicional"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migración de direcciones a contactos"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Sec. contacto"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funciones contacto"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Sino estos detalles no serán visibles desde direcciones/contactos."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contacto.instalador"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "Seq."
-#~ msgstr "Sec."
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
-
-#~ msgid "Contact to function"
-#~ msgstr "Contacto a cargo"
-
-#~ msgid "Main Job"
-#~ msgstr "Trabajo principal"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Define contactos y cargos."
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Función contacto en Socio"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Function"
-#~ msgstr "Cargo"
-
-#~ msgid "Address"
-#~ msgstr "Dirección"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado."
-
-#~ msgid "Address Migration"
-#~ msgstr "Migración direcciones"
-
-#~ msgid "Date Start"
-#~ msgstr "Fecha inicial"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Abrir trabajos"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Puede migrar las direcciones actuales de la empresa al contacto."
diff --git a/addons/base_contact/i18n/es_VE.po b/addons/base_contact/i18n/es_VE.po
deleted file mode 100644
index b52490050ce..00000000000
--- a/addons/base_contact/i18n/es_VE.po
+++ /dev/null
@@ -1,582 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-28 08:39+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:09+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "# of Contacts"
-msgstr "Número de Contactos"
-
-#. module: base_contact
-#: field:res.partner.job,fax:0
-msgid "Fax"
-msgstr "Fax"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: base_contact
-#: help:res.partner.job,date_start:0
-msgid "Start date of job(Joining Date)"
-msgstr "Fecha inicial del trabajo (fecha de unión)."
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Select the Option for Addresses Migration"
-msgstr "Seleccione la opción para la migración de direcciones"
-
-#. module: base_contact
-#: help:res.partner.job,function:0
-msgid "Function of this contact with this partner"
-msgstr "Función de este contacto con esta empresa."
-
-#. module: base_contact
-#: help:res.partner.job,state:0
-msgid "Status of Address"
-msgstr "Estado de la dirección."
-
-#. module: base_contact
-#: help:res.partner.job,name:0
-msgid ""
-"You may                     enter Address first,Partner will be linked "
-"automatically if any."
-msgstr ""
-"Puede introducir primero una dirección, se relacionará automáticamente con "
-"la empresa si hay una."
-
-#. module: base_contact
-#: help:res.partner.job,fax:0
-msgid "Job FAX no."
-msgstr "Número del Fax del trabajo."
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Móvil"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Gente con la que trabaja."
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
-msgid "Define functions and address."
-msgstr "Definir cargos y direcciones."
-
-#. module: base_contact
-#: help:res.partner.job,date_stop:0
-msgid "Last date of job"
-msgstr "Fecha final del trabajo."
-
-#. module: base_contact
-#: view:base.contact.installer:0
-#: field:base.contact.installer,migrate:0
-msgid "Migrate"
-msgstr "Migrar"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.job,name:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_function0
-msgid "Jobs at a same partner address."
-msgstr "Trabajos en la misma dirección de empresa."
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Empresas"
-
-#. module: base_contact
-#: field:res.partner.job,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Si el campo activo se desmarca, permite ocultar el contacto de la empresa "
-"sin eliminarlo."
-
-#. module: base_contact
-#: model:ir.module.module,description:base_contact.module_meta_information
-msgid ""
-"\n"
-"        This module allows you to manage your contacts entirely.\n"
-"\n"
-"    It lets you define\n"
-"        *contacts unrelated to a partner,\n"
-"        *contacts working at several addresses (possibly for different "
-"partners),\n"
-"        *contacts with possibly different functions for each of its job's "
-"addresses\n"
-"\n"
-"    It also adds new menu items located in\n"
-"        Partners \\ Contacts\n"
-"        Partners \\ Functions\n"
-"\n"
-"    Pay attention that this module converts the existing addresses into "
-"\"addresses + contacts\". It means that some fields of the addresses will be "
-"missing (like the contact name), since these are supposed to be defined in "
-"an other object.\n"
-"    "
-msgstr ""
-"\n"
-"        Este módulo le permite gestionar sus contactos de forma completa.\n"
-"\n"
-"    Le permite definir:\n"
-"        *contactos sin ninguna relación con una empresa,\n"
-"        *contactos que trabajan en varias direcciones (probablemente para "
-"distintas empresas),\n"
-"        *contactos con varias funciones para cada una de sus direcciones de "
-"trabajo\n"
-"\n"
-"    También añade nuevas entradas de menús localizadas en:\n"
-"        Empresas \\ Contactos\n"
-"        Empresas \\ Funciones\n"
-"\n"
-"    Tenga cuidado que este módulo convierte las direcciones existentes en "
-"\"direcciones + contactos\". Esto significa que algunos campos de las "
-"direcciones desaparecerán (como el nombre del contacto), ya que se supone "
-"que estarán definidos en otro objeto.\n"
-"    "
-
-#. module: base_contact
-#: model:ir.module.module,shortdesc:base_contact.module_meta_information
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.job,date_stop:0
-msgid "Date Stop"
-msgstr "Fecha finalización"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
-msgid "Contact's Jobs"
-msgstr "Trabajos del contacto"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Categories"
-msgstr "Categorías"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_partner:0
-msgid ""
-"Order of importance                 of this job title in the list of job "
-"title of the linked partner"
-msgstr ""
-"Orden de importancia de este título de trabajo en la lista de títulos de "
-"trabajo de la empresa relacionada."
-
-#. module: base_contact
-#: field:res.partner.job,extension:0
-msgid "Extension"
-msgstr "Extensión"
-
-#. module: base_contact
-#: help:res.partner.job,extension:0
-msgid "Internal/External extension phone number"
-msgstr "Número de extensión telefónica interior/exterior"
-
-#. module: base_contact
-#: help:res.partner.job,phone:0
-msgid "Job Phone no."
-msgstr "Número de teléfono del trabajo."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Cargos y direcciones"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.job,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: help:res.partner.job,email:0
-msgid "Job E-Mail"
-msgstr "Correo electrónico del trabajo."
-
-#. module: base_contact
-#: field:res.partner.job,sequence_partner:0
-msgid "Partner Seq."
-msgstr "Sec. empresa"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
-msgid "Function to address"
-msgstr "Cargo a dirección"
-
-#. module: base_contact
-#: field:base.contact.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Last Name"
-msgstr "Apellido"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.contact:0
-msgid "Communication"
-msgstr "Comunicación"
-
-#. module: base_contact
-#: field:base.contact.installer,config_logo:0
-#: field:res.partner.contact,photo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Past"
-msgstr "Anterior"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Address's Migration to Contacts"
-msgstr "Migración de direcciones a contactos"
-
-#. module: base_contact
-#: field:res.partner.job,sequence_contact:0
-msgid "Contact Seq."
-msgstr "Sec. contacto"
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "Search Contact"
-msgstr "Buscar contacto"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: view:res.partner:0
-#: field:res.partner.address,job_ids:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid ""
-"Due to changes in Address and Partner's relation, some of the details from "
-"address are needed to be migrated into contact information."
-msgstr ""
-"Debido a los cambios en la relación entre Direcciones y Empresas, algunos de "
-"los detalles de las direcciones son necesarios migrarlos a la información de "
-"contactos."
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Direcciones de trabajo y privadas."
-
-#. module: base_contact
-#: help:res.partner.job,address_id:0
-msgid "Address which is linked to the Partner"
-msgstr "Dirección que está relacionada con la empresa."
-
-#. module: base_contact
-#: field:res.partner.job,function:0
-msgid "Partner Function"
-msgstr "Función en empresa"
-
-#. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr "Campo para teléfono adicional"
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sitio web"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Otherwise these details will not be visible from address/contact."
-msgstr "Si no estos detalles no serán visibles desde direcciones/contactos."
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-#: field:res.partner.job,email:0
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_base_contact_installer
-msgid "base.contact.installer"
-msgstr "base.contacto.instalador"
-
-#. module: base_contact
-#: view:res.partner.job:0
-msgid "Contact Functions"
-msgstr "Funciones contacto"
-
-#. module: base_contact
-#: field:res.partner.job,phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr "¿Desea migrar los datos de direcciones hacia los datos de contacto?"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Función principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir empresas y sus direcciones."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Seq."
-msgstr "Sec."
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Información extra"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas en las que trabaja."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto empresa"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fecha nacimiento"
-
-#. module: base_contact
-#: help:base.contact.installer,migrate:0
-msgid "If you select this, all addresses will be migrated."
-msgstr "Si selecciona esta opción, todas las direcciones serán migradas."
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_job
-msgid "Contact Partner Function"
-msgstr "Función contacto en empresa"
-
-#. module: base_contact
-#: field:res.partner.job,other:0
-msgid "Other"
-msgstr "Otro"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_function0
-msgid "Function"
-msgstr "Cargo"
-
-#. module: base_contact
-#: field:res.partner.address,job_id:0
-#: field:res.partner.contact,job_id:0
-msgid "Main Job"
-msgstr "Trabajo principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_contacttofunction0
-msgid "Defines contacts and functions."
-msgstr "Define contactos y cargos."
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_contacttofunction0
-msgid "Contact to function"
-msgstr "Contacto a cargo"
-
-#. module: base_contact
-#: view:res.partner:0
-#: field:res.partner.job,address_id:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidad"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
-msgid "Open Jobs"
-msgstr "Abrir trabajos"
-
-#. module: base_contact
-#: field:base.contact.installer,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "You can migrate Partner's current addresses to the contact."
-msgstr "Puede migrar las direcciones actuales de la empresa al contacto."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Empleado principal"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
-msgid "Address Migration"
-msgstr "Migración direcciones"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Postal Address"
-msgstr "Dirección postal"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-#: view:res.partner:0
-msgid "Addresses"
-msgstr "Direcciones"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Empresa a dirección"
-
-#. module: base_contact
-#: field:res.partner.job,date_start:0
-msgid "Date Start"
-msgstr "Fecha inicio"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_contact:0
-msgid ""
-"Order of                     importance of this address in the list of "
-"addresses of the linked contact"
-msgstr ""
-"Orden de importancia de esta dirección en la lista de direcciones del "
-"contacto relacionado."
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Orden de importancia de este empleo en la lista de empleos de la empresa "
-#~ "relacionada"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Orden de importancia de esta dirección en la lista de direcciones del "
-#~ "contacto relacionado"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proceso contacto base"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactos de la empresa"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
diff --git a/addons/base_contact/i18n/et.po b/addons/base_contact/i18n/et.po
deleted file mode 100644
index fa72765fabb..00000000000
--- a/addons/base_contact/i18n/et.po
+++ /dev/null
@@ -1,377 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-11-09 16:40+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontaktid"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Eesnimi"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partner aadressidesse"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Veebileht"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Tiitel"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Baas kontakt"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-post"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktiivne"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Rahvus"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Peamine funktsioon"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Defineeri partnerid ja nende aadressid."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Keel"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobiil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Inimesed kellega sa töötad"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Täiendav informatsioon"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Otstarbed ja aadressid"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Ettevõtted kellega sa töötad"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Peamine tööandja"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Partneri Kontakt"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Aadressid"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Töö ja kodune aadress"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Perekonnanimi"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Üldine"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partnerid"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Sünnikuupäev"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Kontakti järjestus"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partneri järjestus"
-
-#~ msgid "Current"
-#~ msgstr "Praegune"
-
-#~ msgid "Function"
-#~ msgstr "Funktsioon"
-
-#~ msgid "Main Job"
-#~ msgstr "Peamine töö"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Määratleb kontaktid ja otstarbed."
-
-#~ msgid "Contact Functions"
-#~ msgstr "Kontaktifunktsioonid"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr "Selle ameti tähtsus kontakti ametite nimistus."
-
-#~ msgid "Date Stop"
-#~ msgstr "Lõppkuupäev"
-
-#~ msgid "Address"
-#~ msgstr "Aadress"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Kontakti ametid"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "Selle aadressi tähtsus kontakti aadresside nimistus."
-
-#~ msgid "Categories"
-#~ msgstr "Kategooriad"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Kontakti alusprotsess"
-
-#~ msgid "Seq."
-#~ msgstr "Jada"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Partneri Kontaktid"
-
-#~ msgid "State"
-#~ msgstr "Olek"
-
-#~ msgid "Past"
-#~ msgstr "Endine"
-
-#~ msgid "General Information"
-#~ msgstr "Üldine Informatsioon"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Ametid sama partneri aadressil"
-
-#~ msgid "Date Start"
-#~ msgstr "Alguskuupäev"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Määratle otstarbed ja aadressid."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#~ msgid "# of Contacts"
-#~ msgstr "Kontaktide arv"
-
-#~ msgid "Fax"
-#~ msgstr "Faks"
-
-#~ msgid "Extension"
-#~ msgstr "Laiendus"
-
-#~ msgid "Other"
-#~ msgstr "Muu"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Lisa telefoniväli"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Kontaktpartneri funktsioon"
-
-#~ msgid "Partner Function"
-#~ msgstr "Partneri funktsioon"
-
-#~ msgid "Function to address"
-#~ msgstr "Funktsioon aadressidesse"
-
-#~ msgid "Contact to function"
-#~ msgstr "Kontakt funktsioonidesse"
diff --git a/addons/base_contact/i18n/fa.po b/addons/base_contact/i18n/fa.po
deleted file mode 100644
index d0c554bb90d..00000000000
--- a/addons/base_contact/i18n/fa.po
+++ /dev/null
@@ -1,264 +0,0 @@
-# Persian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-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: 2011-12-19 09:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Persian <fa@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:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
diff --git a/addons/base_contact/i18n/fi.po b/addons/base_contact/i18n/fi.po
deleted file mode 100644
index d77d0644f78..00000000000
--- a/addons/base_contact/i18n/fi.po
+++ /dev/null
@@ -1,461 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-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: 2010-08-03 00:59+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontaktit"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Etunimi"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Yhteistyökumppanin osoite"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Jos aktiivisuus tila on asetettu ei-voimassa (false) se sallii sinun "
-"piilottaa kontaktin poistamatta sitä."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Websivu"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Otsikko"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Pääkontakti"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Sähköposti"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktiivinen"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Kansallisuus"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Postiosoite"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Päätoiminto"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Määrittää kumppanit ja heidän osoitteet"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nimi"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Kieli"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Matkapuhelin"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Huomautukset"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Ihmiset joiden kanssa teet töitä"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Lisätiedot"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Toiminnot ja osoitteet"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakti"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Yritykset joiden kanssa teet yhteistyötä"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Päätyönantaja"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Kumppanin Yhteystiedot"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Osoitteet"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Työ -ja yksityisosoitteet"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Sukunimi"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Kuva"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Yleiset"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Kumppani"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Kumppanit"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Kumppanien osoitteet"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Syntymäaika"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Määrittää kontaktit ja toiminnot"
-
-#~ msgid "# of Contacts"
-#~ msgstr "Kontaktien määrä"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Lisäpuheliinnumero:"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Kontaktin työtehtävät"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Kontaktitoiminnot"
-
-#~ msgid "Date Stop"
-#~ msgstr "Loppupäivämäärä"
-
-#~ msgid "Main Job"
-#~ msgstr "Päätyötehtävä"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-
-#~ msgid "Phone"
-#~ msgstr "Puhelin"
-
-#~ msgid "Fax"
-#~ msgstr "Faksi"
-
-#~ msgid "Categories"
-#~ msgstr "Kategoriat"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
-#~ msgid "Extension"
-#~ msgstr "Laajennus"
-
-#~ msgid "Address"
-#~ msgstr "Osoite"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Kumppanien yhteishenkilöt"
-
-#~ msgid "General Information"
-#~ msgstr "Yleiset Tiedot"
-
-#~ msgid "Date Start"
-#~ msgstr "Aloituspäivämäärä"
-
-#~ msgid "Current"
-#~ msgstr "Nykyinen"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
-
-#~ msgid "Other"
-#~ msgstr "Muu"
-
-#~ msgid "Function"
-#~ msgstr "Toiminto"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Määrittele toiminnot ja osoitteet"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Voit lisätä osoitteen ensin. Yhteistyökumppani linkitetään siihen "
-#~ "automaattisesti (jos on)"
-
-#~ msgid "Job FAX no."
-#~ msgstr "Työ FAX numero"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Tämän yhteystiedon toimi tämän yhteistyökumppanin yhteydessä"
-
-#~ msgid "Status of Address"
-#~ msgstr "Osoitteen tila"
-
-#~ msgid "title"
-#~ msgstr "otsikko"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Työn aloituspäivä"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Valitse vaihtoehto osoitteiden yhdistämiselle"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Työpuhelinnumero"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Tämän tehtävän tärkeysjärjestys linkitetyn yhteistyökumppanin hierarkiassa"
-
-#~ msgid "Migrate"
-#~ msgstr "Siirrä"
-
-#~ msgid "State"
-#~ msgstr "Tila"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "työt samassa yhteistyökumppanin osoitteessa"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Sisäinen/Ulkoinen alaliittymänumero"
-
-#~ msgid "Last date of job"
-#~ msgstr "Viimeinen työpäivä"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Työsähköposti"
-
-#~ msgid "Image"
-#~ msgstr "Kuva"
-
-#~ msgid "Communication"
-#~ msgstr "Viestintä"
-
-#~ msgid "Function to address"
-#~ msgstr "Osoitteen toimi"
-
-#~ msgid "Past"
-#~ msgstr "Mennyt"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Kontaktin numero"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfiguraation eteneminen"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Osoitteiden yhdistäminen kontakteihin"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Yhteistyökumppanin järjestysnumero"
-
-#~ msgid "Seq."
-#~ msgstr "Sarja"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr ""
-#~ "Muuten nämä yksityiskohdat eivät ole näkyvissä osoitteessa/kontaktissa."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Osoite joka on linkitetty yhteistyökumppaniin"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Koska yhteistyökumppanin yhteydet tai osoitteet ovat muuttuneet, tietoja "
-#~ "pitää yhdistää kontaktitietoihin"
-
-#~ msgid "Partner Function"
-#~ msgstr "Partnerin toiminto"
-
-#~ msgid "Search Contact"
-#~ msgstr "Etsi Yhteystiedoista"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Haluatko yhdistää osoitetiedot kontaktitiedoissa?"
-
-#~ msgid "Configure"
-#~ msgstr "Konfiguroi"
-
-#~ msgid "Address Migration"
-#~ msgstr "Osoitteiden yhdistely"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Yhteistyöpartnerin toiminto"
-
-#~ msgid "Contact to function"
-#~ msgstr "Ota yhteyttä toimintoon"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Avoimet työpaikat"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Jos valitset tämän, kaikki osoitteet siirretään"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Voit päivittää yhteistyökumppanin nykyiset osoitteet kontaktille."
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "Tämän osoitteen tärkeys kontaktin osoitelistalla"
diff --git a/addons/base_contact/i18n/fr.po b/addons/base_contact/i18n/fr.po
deleted file mode 100644
index 14fd9c95589..00000000000
--- a/addons/base_contact/i18n/fr.po
+++ /dev/null
@@ -1,530 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-18 16:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contacts"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Prénom"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partenaire vers adresse"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Si le champ actif est à \"Faux\", cela vous permettra de cacher le contact "
-"du partenaire sans le supprimer."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Site Internet"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Titre"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Base Contact"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Courriel"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Actif"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nationalité"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Adresse postale"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Fonction principale"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Définir les partenaires et leurs adresses"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Langue"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Portable"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Remarques"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Personnes avec qui vous travaillez"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Information supplémentaire"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Fonctions et adresses"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contact"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Entreprises avec lesquelles vous travaillez"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Employeur principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contact du partenaire"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adresses"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Adresses privées et professionnelles"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Nom"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Photo"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Général"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partenaire"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partenaires"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adresses des partenaires"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Date de naissance"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Séq. du contact"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Partner Function"
-#~ msgstr "Fonction du partenaire"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Séq. du partenaire"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Fonction du contact du partenaire"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contact vers fonction"
-
-#~ msgid "Function"
-#~ msgstr "Fonction"
-
-#~ msgid "Main Job"
-#~ msgstr "Emploi principal"
-
-#~ msgid "Phone"
-#~ msgstr "Téléphone"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Définir les contacts et leurs fonctions"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Fonctions du contact"
-
-#~ msgid "Date Stop"
-#~ msgstr "Date de fin d'emploi"
-
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Fonctions des contacts"
-
-#~ msgid "Categories"
-#~ msgstr "Catégories"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Traiter les contacts de base"
-
-#~ msgid "Seq."
-#~ msgstr "Séq."
-
-#~ msgid "Function to address"
-#~ msgstr "Fonction vers adresse"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contacts du partenaire"
-
-#~ msgid "Other"
-#~ msgstr "Autre"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# de contacts"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Modèle non valide dans la définition de l'action."
-
-#~ msgid "Additional phone field"
-#~ msgstr "Champ téléphone supplémentaire"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Ordre de tri de ce poste dans la liste des postes du partenaire qui y est lié"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Ordre de tri de cette adresse dans la liste des adresses du contact qui y "
-#~ "est lié"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr ""
-#~ "La structure XML définissant l'architecture de cette vue n'est pas correcte!"
-
-#~ msgid "Extension"
-#~ msgstr "Extension"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Numéro d'extension interne/externe"
-
-#~ msgid "State"
-#~ msgstr "État"
-
-#~ msgid "Past"
-#~ msgstr "Précédente"
-
-#~ msgid "General Information"
-#~ msgstr "Informations générales"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Emplois situés à la même adresse de partenaire"
-
-#~ msgid "Date Start"
-#~ msgstr "Date de début"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Définir les fonctions et l'adresse"
-
-#~ msgid "Current"
-#~ msgstr "Actuelle"
-
-#~ msgid "Job FAX no."
-#~ msgstr "N° de fax professionnel"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Rôle de ce contact chez ce partenaire"
-
-#~ msgid "Status of Address"
-#~ msgstr "Statut de l'adresse"
-
-#~ msgid "title"
-#~ msgstr "titre"
-
-#~ msgid "Migrate"
-#~ msgstr "Migrer"
-
-#~ msgid "Last date of job"
-#~ msgstr "Dernière date d'emploi"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Date de début d'emploi (date d'entrée)"
-
-#~ msgid "Job Phone no."
-#~ msgstr "N° de téléphone professionnel"
-
-#~ msgid "Image"
-#~ msgstr "Image"
-
-#~ msgid "Communication"
-#~ msgstr "Communication"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adresse liée au partenaire"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Avancement de la configuration"
-
-#~ msgid "Address Migration"
-#~ msgstr "Migration des adresses"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Vous pouvez entrer l'adresse en premier : le partenaire sera lié "
-#~ "automatiquement s'il existe."
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "En raison de modifications dans la relation entre le partenaire et les "
-#~ "adresses, certains détails des adresses doivent migrer dans les informations "
-#~ "de contact."
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Courriel professionnel"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Ordre d'importance de cette fonction dans la liste des fonctions du "
-#~ "partenaire lié"
-
-#~ msgid "Search Contact"
-#~ msgstr "Chercher un contact"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Sinon, ces détails ne seront pas visibles dans l'adresse/le contact."
-
-#~ msgid "Open Jobs"
-#~ msgstr "Postes à pourvoir"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Ordre d'importance de cette adresse dans le carnet d'adresses du contact lié"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer par x_ et ne doit contenir aucun caractère "
-#~ "spécial !"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Si vous sélectionnez ceci, toutes les adresses seront migrées."
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr ""
-#~ "Voulez-vous faire migrer les données des adresses dans les données des "
-#~ "contacts ?"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Sélectionnez l'option pour la migration des adresses"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migration des adresses vers les contacts"
-
-#~ msgid "Configure"
-#~ msgstr "Configurer"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr ""
-#~ "Vous pouvez migrer les adresses actuelles du partenaire vers le contact."
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Ce module vous permet de gérer entièrement vos contacts.\n"
-#~ "\n"
-#~ "    Il vous permet de définir\n"
-#~ "        *des contacts non associés à un partenaire,\n"
-#~ "        *des contacts travaillant à différentes adresses (par exemple, pour "
-#~ "plusieurs partenaires),\n"
-#~ "        *des contacts avec peut-être différents titres pour chaque adresse\n"
-#~ "\n"
-#~ "    Il ajoute aussi de nouveaux éléments de menu dans\n"
-#~ "        Partenaires \\ Contacts\n"
-#~ "        Partenaires \\ Titres\n"
-#~ "\n"
-#~ "    Faîtes attention car ce module convertit les adresses existantes en "
-#~ "\"adresses + contacts\". Cela signifie que certains champs des adresses vont "
-#~ "manquer (comme le nom de contact), car ils sont définis dans un autre "
-#~ "objet.\n"
-#~ "    "
diff --git a/addons/base_contact/i18n/gl.po b/addons/base_contact/i18n/gl.po
deleted file mode 100644
index 74fc7e97339..00000000000
--- a/addons/base_contact/i18n/gl.po
+++ /dev/null
@@ -1,483 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-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: 2011-03-11 17:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@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:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nome de pía"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Empresa a enderezo"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Se se desmarca o campo activo, permite ocultar o contacto da empresa sen "
-"eliminalo."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sitio web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidade"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Enderezo postal"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Función principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir empresas e os seus enderezos"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Lingua"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Móbil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Xente con quen traballa."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Información adicional"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Cargos e enderezos"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas onde traballa."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Empregado principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Enderezos"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Enderezos de traballo e privadas."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Apelidos"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Xeral"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Socio"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Socios"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Enderezos de contactos"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Data de nacemento"
-
-#~ msgid "# of Contacts"
-#~ msgstr "Número de Contactos"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Función deste contacto con esta empresa."
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Data inicial do traballo (data de unión)."
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Pode introducir primeiro un enderezo, relacionarase automaticamente coa "
-#~ "empresa se hai unha."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Número do fax do traballo."
-
-#~ msgid "Status of Address"
-#~ msgstr "Estado do enderezo."
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Seleccione a opción para a migración de enderezos"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definir cargos e enderezos."
-
-#~ msgid "Migrate"
-#~ msgstr "Migrar"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Traballos no mesmo enderezo de empresa."
-
-#~ msgid "Last date of job"
-#~ msgstr "Data final do traballo."
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Traballos do contacto"
-
-#~ msgid "Categories"
-#~ msgstr "Categorías"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Número de teléfono do traballo."
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Orde de importancia deste título de traballo na lista de títulos de traballo "
-#~ "da empresa relacionada."
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Este módulo permítelle xestionar os seus contactos por completo. "
-#~ "Permítelle definir:*contactos sen ningunha relación cunha empresa,*contactos "
-#~ "que traballan en varios enderezos (probablemente para distintas "
-#~ "empresas),*contactos con varias funcións para cada un dos seus enderezos de "
-#~ "traballo. Engade tamén novas entradas de menús localizadas en: Empresas \\ "
-#~ "ContactosEmpresas \\ Funcións. Teña en conta que este módulo converte os "
-#~ "enderezos existentes en \"enderezos + contactos\". Isto significa que algúns "
-#~ "campos dos enderezos desaparecerán (coma o nome do contacto), xa que se "
-#~ "supón que estarán definidos noutro obxecto.\n"
-#~ "    "
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Número de extensión telefónica interior/exterior"
-
-#~ msgid "Date Stop"
-#~ msgstr "Data remate"
-
-#~ msgid "Extension"
-#~ msgstr "Extensión"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso da configuración"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Correo electrónico do traballo"
-
-#~ msgid "Image"
-#~ msgstr "Imaxe"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicación"
-
-#~ msgid "Function to address"
-#~ msgstr "Cargo a enderezo"
-
-#~ msgid "Past"
-#~ msgstr "Pasado"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Enderezo que está relacionado coa empresa."
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Por causa dos cambios na relación entre Enderezos e Empresas, cómpre migrar "
-#~ "algúns dos detalles dos enderezos á información de contactos."
-
-#~ msgid "Partner Function"
-#~ msgstr "Función en empresa"
-
-#~ msgid "Search Contact"
-#~ msgstr "Buscar contacto"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Campo para teléfono adicional"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migración de enderezos a contactos"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Sec. contacto"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funcións contacto"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Desexa migrar os datos de Enderezos cara ós datos de contacto?"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Senón estes detalles non serán visibles desde Enderezos/contactos."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contacto.instalador"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "Seq."
-#~ msgstr "Sec."
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Se selecciona esta opción, migraranse tódolos enderezos."
-
-#~ msgid "Main Job"
-#~ msgstr "Traballo principal"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Define contactos e cargos."
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Función contacto en empresa"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contacto a cargo"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Function"
-#~ msgstr "Cargo"
-
-#~ msgid "Address"
-#~ msgstr "Enderezo"
-
-#~ msgid "Other"
-#~ msgstr "Outro"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Orde de importancia deste enderezo na lista de enderezos do contacto "
-#~ "relacionado."
-
-#~ msgid "Address Migration"
-#~ msgstr "Migración enderezos"
-
-#~ msgid "Date Start"
-#~ msgstr "Data inicio"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Abrir traballos"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Pode migrar os enderezos actuais da empresa ó contacto."
-
-#~ msgid "Partner Seq."
-#~ msgstr "Sec. empresa"
diff --git a/addons/base_contact/i18n/gu.po b/addons/base_contact/i18n/gu.po
deleted file mode 100644
index 3c4537b342a..00000000000
--- a/addons/base_contact/i18n/gu.po
+++ /dev/null
@@ -1,264 +0,0 @@
-# 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-03-06 18:22+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-03-07 05:13+0000\n"
-"X-Generator: Launchpad (build 14907)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "શહેર"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "સંપર્કો"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "પ્રથમ નામ"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr "સ્થળ"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "સન્ચારપ્રૌદ્યોગિક"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "Zip"
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "કંપની"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "શીર્ષક"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "ઈ-મેઇલ"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "કાર્યશીલ"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "નાગરિકત્વ"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "પોસ્ટલ સરનામું"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "નામ"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "ભાષા"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "મોબાઇલ"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "દેશ"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "નોંધ"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "વધુ માહિતી"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "સંપર્ક"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "સરનામાંઓ"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "છેલ્લું નામ"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "ફોટો"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr "સ્થળો"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "સામાન્ય"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "શેરી"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "અંગત માહિતી"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "જન્મ તારીખ"
diff --git a/addons/base_contact/i18n/hr.po b/addons/base_contact/i18n/hr.po
deleted file mode 100644
index 4c647bec1b6..00000000000
--- a/addons/base_contact/i18n/hr.po
+++ /dev/null
@@ -1,480 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * base_contact
-# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-07 11:05+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: Vinteh\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-"Language: hr\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "Mjesto"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr "Ime i prezime"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakti"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Ime osobe"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr "Lokacija"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partner na adresu"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Web stranice"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "Poštanski br."
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr "Županija"
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "Organizacija"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Naslov"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr "Glavni partner"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Osnovni kontakt"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Email"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktivan"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalnost"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Poštanska adresa"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Glavna funkcija"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definiraj partnere i adrese"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Naziv"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Jezik"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobilni"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "Država"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Bilješke"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Osobe s kojima radite."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Ostale informacije"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funkcije i adrese"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt osoba"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Tvrtke s kojima radite."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Glavni poslodavac."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Osoba kod partnera"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adrese"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Poslovne i privatne adrese"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Prezime"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Slika"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr "Lokacije"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Podaci"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "Ulica"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partneri"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adrese partnera"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr "Ulica2"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "Osobne informacije"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Datum rođenja"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funkcija partnera"
-
-#~ msgid "Main Job"
-#~ msgstr "Glavni posao"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Function"
-#~ msgstr "Funkcija"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorije"
-
-#~ msgid "Address"
-#~ msgstr "Adresa"
-
-#~ msgid "State"
-#~ msgstr "Stanje"
-
-#~ msgid "Past"
-#~ msgstr "Prošlost"
-
-#~ msgid "Date Start"
-#~ msgstr "Datum početka"
-
-#~ msgid "Extension"
-#~ msgstr "Ekstenzija"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nepravilno ime modela u definiciji radnje."
-
-#~ msgid "# of Contacts"
-#~ msgstr "# Osoba"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "redoslijed važnosti ovog naziva Posla-Radnog mjesta u listi naziva Poslova-"
-#~ "Radnih mjesta povezanog Partnera"
-
-#~ msgid "Date Stop"
-#~ msgstr "Datum Završetka"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "redoslijed važnosti ove Adrese u listi Adresa povezanog Partnera"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proces Osnovne Osobe za kontakt"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Osobe kod Partnera"
-
-#~ msgid "General Information"
-#~ msgstr "Opća Informacija"
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Start date of job(Joining Date)"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Select the Option for Addresses Migration"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Funkcija kontakta kod ovog partnera"
-
-#~ msgid "Status of Address"
-#~ msgstr "Status of Address"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Job FAX no."
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definicija funkcija i adresa"
-
-#~ msgid "Last date of job"
-#~ msgstr "Datum zadnjeg posla"
-
-#~ msgid "Migrate"
-#~ msgstr "Migrate"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Poslovi na istoj adresi partnera"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Poslovi osobe"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Interna/eksterna ekstenzija tel. broja"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Telefon na poslu"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Job E-Mail"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partner r.br."
-
-#~ msgid "Function to address"
-#~ msgstr "Funkcija na adresu"
-
-#~ msgid "Communication"
-#~ msgstr "Veza"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Address's Migration to Contacts"
-
-#~ msgid "Contact Seq."
-#~ msgstr "R.br. kontakta"
-
-#~ msgid "Search Contact"
-#~ msgstr "Traži kontakt"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adresa koja je povezana na Partnera"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Dodatni telefon"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Otherwise these details will not be visible from address/contact."
-
-#~ msgid "Configure"
-#~ msgstr "Postavke"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funkcije osobe"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Do you want to migrate your Address data in Contact Data?"
-
-#~ msgid "Seq."
-#~ msgstr "R.br."
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "If you select this, all addresses will be migrated."
-
-#~ msgid "Current"
-#~ msgstr "Trenutno"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Funkcija osobe kod partnera"
-
-#~ msgid "Other"
-#~ msgstr "Ostale"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Određuje osobe i funkcije"
-
-#~ msgid "Contact to function"
-#~ msgstr "Osoba na funkciju"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Otvori poslove"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "You can migrate Partner's current addresses to the contact."
-
-#~ msgid "Address Migration"
-#~ msgstr "Address Migration"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "Redoslijed važnosti  adrese u popisu adresa povezanog kontakta."
diff --git a/addons/base_contact/i18n/hu.po b/addons/base_contact/i18n/hu.po
deleted file mode 100644
index c8f3b25ad71..00000000000
--- a/addons/base_contact/i18n/hu.po
+++ /dev/null
@@ -1,439 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-31 13:18+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Névjegyek"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Keresztnév"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partner címe"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Állítsa az aktív mező értékét Hamis-ra, hogy elrejtse a kapcsolatot de ne "
-"kelljen törölni."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Weboldal"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Megnevezés"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Alap kapcsolat"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktív"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nemzetiség"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Postai cím"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Fő funkció"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Határozza meg a partnereket és a címeiket."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Név"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Nyelv"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Megjegyzések"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Emberek akikkel dolgozol"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Extra információ"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Beosztások és címek"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Cégek akikkel dolgozol"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Fő munkáltató"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Partneri kapcsolat"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Címek"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Munkahelyi és otthoni címek"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Vezetéknév"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Fénykép"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Általános"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partnerek"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partner címek"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Születési dátum"
-
-#~ msgid "Categories"
-#~ msgstr "Kategóriák"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Kapcsolattartó partner"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partner sorrend"
-
-#~ msgid "Partner Function"
-#~ msgstr "Partner beosztása"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# a kapcsolatoknak"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Plusz telefon mező"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Kapcsolattartó munkaköre"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Kapcsolatartók"
-
-#~ msgid "Main Job"
-#~ msgstr "Fő munkakör"
-
-#~ msgid "Seq."
-#~ msgstr "sorrend"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Belső/Kimenő mellék a telefonszámhoz"
-
-#~ msgid "Date Start"
-#~ msgstr "Indulási időpont"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Határozza meg a beosztást és címet"
-
-#~ msgid "Other"
-#~ msgstr "Egyéb"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Kapcsolat sorsz."
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Feladatok ugyanahoz a partneri címhez"
-
-#~ msgid "Past"
-#~ msgstr "múlt"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "A beírás X_ -el kell, hogy kezdődjön én nem tartalmazhat speciális "
-#~ "karaktereket"
-
-#~ msgid "Contact to function"
-#~ msgstr "Kapcsolat a tisztviselőhöz"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Partner névjegyei"
-
-#~ msgid "Function to address"
-#~ msgstr "Címek"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Current"
-#~ msgstr "Aktuális"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Address"
-#~ msgstr "Cím"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "kapcsolattartó adatai"
-
-#~ msgid "Migrate"
-#~ msgstr "Migráció"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Folyamat beállítása"
-
-#~ msgid "Image"
-#~ msgstr "Kép"
-
-#~ msgid "Communication"
-#~ msgstr "Kommunikáció"
-
-#~ msgid "Function"
-#~ msgstr "Funkció"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Configure"
-#~ msgstr "Beállítás"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Kapcsolatok és funkciók meghatározása"
-
-#~ msgid "State"
-#~ msgstr "Állapot"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Valószínűleg először a címet kell megadnia, a partner automatikusan hozzá "
-#~ "lesz kapcsolva ha létezik."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Munka FAX szám"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "A kapcsolat funkciója ennél a partnernél"
-
-#~ msgid "Status of Address"
-#~ msgstr "Cím státusza"
-
-#~ msgid "title"
-#~ msgstr "cím"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Munka kezdés dátuma (csatlakozás dátuma)"
-
-#~ msgid "Last date of job"
-#~ msgstr "Utolsó munkavégzés dátuma"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Válasszon opciót a cím migrálásához"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Munka E-mail"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Munka Telefonszám"
-
-#~ msgid "Date Stop"
-#~ msgstr "Stop dátum"
-
-#~ msgid "Extension"
-#~ msgstr "Kiterjesztés"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Egyébként ezek az adataok nem lesznek láthatóak a cím/kapcsolat-nál."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Cím ami a Partnerhez van hozzárendelve"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Mivel módosultak a Cím vagy Partner kapcsolata, ezért az elérhetőségi "
-#~ "adatokat migrálni kell a kapcsolat adataiba is."
-
-#~ msgid "Search Contact"
-#~ msgstr "Kapcsolat keresés"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Nyitott munkák"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Cím(ek) migrálása a kapcsolatokhoz"
-
-#~ msgid "Address Migration"
-#~ msgstr "Cím migrálás"
diff --git a/addons/base_contact/i18n/id.po b/addons/base_contact/i18n/id.po
deleted file mode 100644
index 237a816447c..00000000000
--- a/addons/base_contact/i18n/id.po
+++ /dev/null
@@ -1,263 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-11-09 13:45+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po
deleted file mode 100644
index 58da03eab38..00000000000
--- a/addons/base_contact/i18n/it.po
+++ /dev/null
@@ -1,530 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 22:45+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contatti"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nome"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partner da contattare"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Deselezionare il campo attivo per nascondere il contatto del partner senza "
-"rimuoverlo."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Sito Web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Titolo"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contatto base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Attivo"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nazionalità"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Indrizzo postale"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Fuzione principale"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definire i partners e i loro indirizzi."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Lingua"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Cellulare"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Persone con cui lavori."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Informazioni Aggiuntive"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funzioni e Indirizzi"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contatto"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Aziende con cui si lavora"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Datore di lavoro principale"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contatto Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Indirizzi"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Indirizzi di lavoro e privati"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Cognome"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Generale"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partners"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Indirizzi Partner"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Data di Nascita"
-
-#~ msgid "Main Job"
-#~ msgstr "Lavoro principale"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Seq. Partner"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Seq. Contatto"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "Current"
-#~ msgstr "Attuale"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Funzione di contatto Partner"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contatto di funzione"
-
-#~ msgid "Function"
-#~ msgstr "Funzione"
-
-#~ msgid "Phone"
-#~ msgstr "Telefono"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Definire contatti e fuzioni."
-
-#~ msgid "Contact Functions"
-#~ msgstr "Fuinzioni Contatto"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Ordine di importanza di qualifica di attività nella lista delle qualifiche "
-#~ "del partner collegato"
-
-#~ msgid "Date Stop"
-#~ msgstr "Data di arresto"
-
-#~ msgid "Address"
-#~ msgstr "Indirizzo"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Lavori del contatto"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Ordine di importanza di questo indirizzo nella lista degli indirizzi del "
-#~ "contatto collegato"
-
-#~ msgid "Categories"
-#~ msgstr "Categorie"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per Visualizzazione Architettura!"
-
-#~ msgid "Seq."
-#~ msgstr "Seq."
-
-#~ msgid "Function to address"
-#~ msgstr "Funzione da attribuire"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contatti del partner"
-
-#~ msgid "State"
-#~ msgstr "Stato"
-
-#~ msgid "Past"
-#~ msgstr "Passato"
-
-#~ msgid "General Information"
-#~ msgstr "Informazioni Generali"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Attività allo stesso indirizzo del partner"
-
-#~ msgid "Date Start"
-#~ msgstr "Data inizio"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definire funzioni e indirizzi."
-
-#~ msgid "Other"
-#~ msgstr "Altro"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Numero di telefono aggiuntivo"
-
-#~ msgid "Extension"
-#~ msgstr "Interno"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funzione associata"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome del modulo non valido nella definizione dell'azione."
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Processo Contatto base"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Estensione Interna/Esterna numero di telefono"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Bisogna inserire l'indirizzo per primo, il Partner verrà collegato "
-#~ "automaticamente, se esiste."
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Funzione di questo contatto per questo Partner"
-
-#~ msgid "title"
-#~ msgstr "titolo"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Indirizzo che è collegato al Partner"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "E-mail lavoro"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Num. telefono lavoro"
-
-#~ msgid "Search Contact"
-#~ msgstr "Ricerca contatto"
-
-#~ msgid "Image"
-#~ msgstr "Immagine"
-
-#~ msgid "Address Migration"
-#~ msgstr "Migrazione indirizzo"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Job FAX no."
-#~ msgstr "Num. fax lavoro"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr ""
-#~ "Altrimenti questi dettagli non sarebbero visibili da indirizzo/contatto."
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "In seguito a cambiamenti nella relazione Partner - Indirizzi, alcuni "
-#~ "dettagli degli Indirizzi necessitano di essere migrati nelle informazioni "
-#~ "relative al contatto."
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Se selezionate questo, tutti gli indirizzi verranno migrati."
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Vuoi migrare i dati relativi all'indirizzo in quelli del contatto?"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Ordine di importanza di questo titolo di lavoro nella lista completa del "
-#~ "partner collegato"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicazione"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Ordine di importanza di questo indirizzo nella lista completa collegata al "
-#~ "contatto"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Avanzamento configurazione"
-
-#~ msgid "Migrate"
-#~ msgstr "Migra"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Lavori Attuali"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Questo modulo permette di gestire i vostri contatti interamente.\n"
-#~ "\n"
-#~ "    Permette di definire\n"
-#~ "        * contatti non relazionati necessariamente con un partner,\n"
-#~ "        * contatti che lavorano per parecchi indirizzi (possibilità per "
-#~ "partner differenti),\n"
-#~ "        * contatti con la possibilità di avere differenti funzioni per "
-#~ "ognuno degli indirizzi lavorativi\n"
-#~ "\n"
-#~ "    Aggiunge inoltre un nuovo menù in:\n"
-#~ "        Partner \\ Contatti\n"
-#~ "        Partner \\ Funzioni\n"
-#~ "\n"
-#~ "    Prestare attenzione che questo modulo converte l'attuale indirizzo in "
-#~ "\"indirizzo + contatti\". Ciò significa che alcuni campi dell'indirizzo "
-#~ "verranno persi (come il nome contatto), dato che questi si suppongono "
-#~ "definiti in un altro oggetto.\n"
-#~ "    "
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Seleziona l'opzione per la migrazione indirizzi"
-
-#~ msgid "Last date of job"
-#~ msgstr "Data termine posizione"
-
-#~ msgid "Configure"
-#~ msgstr "Configura"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "E' possibile migrare l'attuale indirizzo partner a contatto"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "MIgrazione da Indirizzo a Contatto"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# di Contatti"
-
-#~ msgid "Status of Address"
-#~ msgstr "Stato dell'indirizzo"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Data inizio posizione (data assunzione)"
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
deleted file mode 100644
index 2453a76db4e..00000000000
--- a/addons/base_contact/i18n/ko.po
+++ /dev/null
@@ -1,374 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-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: 2010-08-03 01:28+0000\n"
-"Last-Translator: Bundo <bundo@bundo.biz>\n"
-"Language-Team: Korean <ko@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "접촉"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "성"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "파트너 주소"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "웹 사이트"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "제목"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "기본 연락"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "이메일"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "활성"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "국적"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "주요 기능"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "파트너와 주소 정의"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "언어"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "휴대전화"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "함께 일하는 사람들"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "추가 정보"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "기능과 주소"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "연락처"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "협력 업체들"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "주 고용자"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "파트너 연락처"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "주소"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "직장 및 집 주소"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "이름"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "일반"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "파트너"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "파트너"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "생일"
-
-#~ msgid "Other"
-#~ msgstr "기능"
-
-#~ msgid "Current"
-#~ msgstr "현재"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "파트너 접촉 기능"
-
-#~ msgid "Partner Seq."
-#~ msgstr "파트너 시퀀스"
-
-#~ msgid "Contact Seq."
-#~ msgstr "접촉 시퀀스"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "연락처와 기능 정의"
-
-#~ msgid "Partner Function"
-#~ msgstr "파트너 기능"
-
-#~ msgid "# of Contacts"
-#~ msgstr "연락처의 #"
-
-#~ msgid "Phone"
-#~ msgstr "전화"
-
-#~ msgid "Function"
-#~ msgstr "기능"
-
-#~ msgid "Fax"
-#~ msgstr "팩스"
-
-#~ msgid "Additional phone field"
-#~ msgstr "추가 전화 필드"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "접촉 대상자의 직업"
-
-#~ msgid "Main Job"
-#~ msgstr "주업"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr "링크된 파트너의 직종 리스트에 있는 중요성 순서"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "링크된 파트너의 직종 리스트에 있는 중요성 순서"
-
-#~ msgid "Contact Functions"
-#~ msgstr "연락 기능"
-
-#~ msgid "Date Stop"
-#~ msgstr "날짜 중단"
-
-#~ msgid "Address"
-#~ msgstr "주소"
-
-#~ msgid "Seq."
-#~ msgstr "시퀀스"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "기본 접촉 프로세스"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "파트너 연락처"
-
-#~ msgid "Define functions and address."
-#~ msgstr "기능과 주소 정의"
-
-#~ msgid "General Information"
-#~ msgstr "일반 정보"
-
-#~ msgid "State"
-#~ msgstr "상태"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "동일한 파트너 주소의 직업"
-
-#~ msgid "Past"
-#~ msgstr "과거"
-
-#~ msgid "Date Start"
-#~ msgstr "시작 날짜"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "액션 정의에서 유효하지 않은 모델 이름"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
-
-#~ msgid "Categories"
-#~ msgstr "항목"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "내부/외부 확장 전화 번호"
-
-#~ msgid "Extension"
-#~ msgstr "확장기능"
-
-#~ msgid "Function to address"
-#~ msgstr "기능 주소"
diff --git a/addons/base_contact/i18n/lo.po b/addons/base_contact/i18n/lo.po
deleted file mode 100644
index 23d0fcf6051..00000000000
--- a/addons/base_contact/i18n/lo.po
+++ /dev/null
@@ -1,315 +0,0 @@
-# Lao translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-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: 2011-01-17 17:50+0000\n"
-"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
-"Language-Team: Lao <lo@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:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "ຊື່"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "ຫົວຂໍ້້"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "ທີ່ຕິດຕໍ່ຕອນຕົ້ນ"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "ພາສາ"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "ໂມໄບລ"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "ຂໍ້ນບັນທຶກ"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "ພວກທີ່ທ່ານເຮັດວຽກນໍາ"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "ຄຸ່ຄ້າ"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "ພວກຄູ່ຄ້າ"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
-
-#~ msgid "Status of Address"
-#~ msgstr "ສພາບການຂອງທີ່ຢູ່"
-
-#~ msgid "title"
-#~ msgstr "ຫົວຂໍ້:"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "ວັນທີເລີ່ມທໍາງານ"
-
-#~ msgid "Fax"
-#~ msgstr "ເເຟກຊ"
-
-#~ msgid "Last date of job"
-#~ msgstr "ວັນທີສຸດທ້າຍທີ່ເຮັດວຽກ"
-
-#~ msgid "Migrate"
-#~ msgstr "ຍ້າຍໄປ"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# ສໍາລັບທີ່ຕິດຕໍ່"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "ທ່ານອາດເອົາທີ່ຢູ່ເຂົ້າກ່ອນ, ບາດເເລ້ວ ຄູ່ຄ້າຈະຕິດພັນເຂົ້ວເເບບອັດຕະໂນມັດ"
-
-#~ msgid "Job FAX no."
-#~ msgstr "ວຢກເເຟກຊ ນໍ້າເບີ"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "ງານໃນທີ່ຢູ່ຄູ່ຄ້າບ່ອນດຽວ"
-
-#~ msgid "Job Phone no."
-#~ msgstr "ເບີໂທລະສັບວຽກງານ"
-
-#~ msgid "Date Stop"
-#~ msgstr "ວັນທິຢຸດ"
-
-#~ msgid "Search Contact"
-#~ msgstr "ຊອກຫາ ຜູ້ຕິດຕໍ່"
-
-#~ msgid "Other"
-#~ msgstr "ອື່ນ ໆ"
-
-#~ msgid "Phone"
-#~ msgstr "ໂທລະສັບ"
-
-#~ msgid "Current"
-#~ msgstr "ປະຈຸບັນ"
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
deleted file mode 100644
index 286f497953b..00000000000
--- a/addons/base_contact/i18n/lt.po
+++ /dev/null
@@ -1,364 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * base_contact
-# Giedrius Slavinskas <giedrius.slavinskas@gmail.com>, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-09-09 07:09+0000\n"
-"Last-Translator: Giedrius Slavinskas - inovera.lt "
-"<giedrius.slavinskas@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-"Language: lt\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontaktai"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Vardas"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Svetainė"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Antraštė"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "El. paštas"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktyvus"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Tautybė"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Pagrindinė funkcija"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Pasirinkite partnerius ir jų adresus"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Kalba"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobilus telefonas"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Bendradarbiai"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Papildoma informacija"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Pareigos ir adresai"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontaktas"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Įmonė kurioje jūs dirbate."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Pagrindinis darbdavys"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Partnerio kontaktai"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adresai"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Darbo ir asmeninis adresai."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Pavardė"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Bendrasis"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partneris"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partneriai"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Gimimo data"
-
-#~ msgid "Address"
-#~ msgstr "Adresas"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorijos"
-
-#~ msgid "State"
-#~ msgstr "Būsena"
-
-#~ msgid "General Information"
-#~ msgstr "Bendroji informacija"
-
-#~ msgid "Date Start"
-#~ msgstr "Pradžios data"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Partnerio pareigos"
-
-#~ msgid "Current"
-#~ msgstr "Dabartinis"
-
-#~ msgid "Other"
-#~ msgstr "Kita"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Partnerių kontaktai"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Kontakto seka"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "Partnerių kontaktai"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių !"
-
-#~ msgid "Partner Function"
-#~ msgstr "Partnerio pareigos"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partnerio seka"
-
-#~ msgid "# of Contacts"
-#~ msgstr "Kontaktai"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Papildomos informacijos laukas"
-
-#~ msgid "Function"
-#~ msgstr "Adresas"
-
-#~ msgid "Fax"
-#~ msgstr "Faksas"
-
-#~ msgid "Phone"
-#~ msgstr "Telefonas"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Kontaktų pareigos"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr "Pareigos pagal svarbumą susijusiam partneriui."
-
-#~ msgid "Date Stop"
-#~ msgstr "Pabaigos data"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Kontaktų pareigos"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "Adresai pagal svarbumą sąraše."
-
-#~ msgid "Main Job"
-#~ msgstr "Pagrindinės pareigos"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Netinkamas XML peržiūros struktūrai!"
-
-#~ msgid "Seq."
-#~ msgstr "Seka"
-
-#~ msgid "Extension"
-#~ msgstr "Papildomas telefonas"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Vidinis/išorinis papildomas telefono numeris"
-
-#~ msgid "Past"
-#~ msgstr "Buvęs"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Darbai su to paties partnerio adresu."
diff --git a/addons/base_contact/i18n/lv.po b/addons/base_contact/i18n/lv.po
deleted file mode 100644
index 9069a60bf54..00000000000
--- a/addons/base_contact/i18n/lv.po
+++ /dev/null
@@ -1,442 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-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: 2010-12-20 05:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Latvian <lv@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:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakti"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Vārds"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partneris -> adrese"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Mājaslapa"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Uzruna"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Pamata Kontakts"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-pasts"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktīvs"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionālā Piederība"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Pasta adrese"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Pamatfunkcija"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definēt partnerus un to adreses."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nosaukums"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Valoda"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobilais tālr."
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Piezīmes"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Darba kolēģi."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Papildus Informācija"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Amati un Adreses"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakts"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Sadarbības partneri."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Galvenais Darba Devējs"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Partnera Kontakts"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adreses"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Darba un privātās adreses."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Uzvārds"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Vispārējs"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partneris"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partneri"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partnera Adreses"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Dzimšanas datums"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Other"
-#~ msgstr "Cits"
-
-#~ msgid "# of Contacts"
-#~ msgstr "Kontaktu Skaits"
-
-#~ msgid "Phone"
-#~ msgstr "Tālrunis"
-
-#~ msgid "Fax"
-#~ msgstr "Fakss"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Papildus tālruņa lauks"
-
-#~ msgid "Main Job"
-#~ msgstr "Galvenā Darbavieta"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Kontakta Darbavietas"
-
-#~ msgid "Address"
-#~ msgstr "Adrese"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorijas"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Vietējais / Pilsētas tālruņa numurs"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nepareizs Skatījuma uzbūves XML!"
-
-#~ msgid "Extension"
-#~ msgstr "Tālrunis"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Partnera Kontakti"
-
-#~ msgid "General Information"
-#~ msgstr "Vispārēja Informācija"
-
-#~ msgid "Date Start"
-#~ msgstr "Sākuma Datums"
-
-#~ msgid "Current"
-#~ msgstr "Tekošais"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekta nosaukumam jāsākas ar x_ un tas nedrīkst saturēt speciālos simbolus!"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partnera Secība"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Kontakta Funkcijas"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Tiek definēti kontakti un funkcijas"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Partnera Kontakta Funkcijas"
-
-#~ msgid "Partner Function"
-#~ msgstr "Partnera Funkcijas"
-
-#~ msgid "Contact to function"
-#~ msgstr "Kontakts -> Funkcija"
-
-#~ msgid "Function"
-#~ msgstr "Funkcijas"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Kontaktu Sec."
-
-#~ msgid "Seq."
-#~ msgstr "Sec."
-
-#~ msgid "State"
-#~ msgstr "Stāvoklis"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr "Amatu nozīmīguma kārtība, saistītā partnera amatu sarakstā."
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "Adrešu nozīmīguma kārtība, saistītā partnera adrešu sarakstā."
-
-#~ msgid "Date Stop"
-#~ msgstr "Datums, kad Apturēt"
-
-#~ msgid "Function to address"
-#~ msgstr "Funkcijas -> adrese"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Amati tajā pašā partnera adresē"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definēt funkcijas un adreses"
-
-#~ msgid "Past"
-#~ msgstr "Iepriekšējie"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Šī kontakta funkcija pie šī partnera"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Varat vispirms ievadīt adresi, partneris tiks piesaistīt automātiski, ja būs "
-#~ "atrasts."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Darba faksa nr."
-
-#~ msgid "Status of Address"
-#~ msgstr "Adreses statuss"
-
-#~ msgid "title"
-#~ msgstr "uzruna"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Darba (pievienošanās) sākuma datums"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Izvēlēties adreses migrācijas iespēju"
-
-#~ msgid "Migrate"
-#~ msgstr "Migrēt"
-
-#~ msgid "Last date of job"
-#~ msgstr "Darba beigu datums"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Darba tālruņa nr."
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Darba e-pasts"
-
-#~ msgid "Image"
-#~ msgstr "Attēls"
-
-#~ msgid "Communication"
-#~ msgstr "Saziņa"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfigurācijas Progress"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adrese, kas ir piesaistīta pie partnera"
-
-#~ msgid "Search Contact"
-#~ msgstr "Meklēt Kontaktu"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Adreses migrācija uz kontaktiem"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Configure"
-#~ msgstr "Konfigurēt"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Vakances"
-
-#~ msgid "Address Migration"
-#~ msgstr "Adrese migrācija"
diff --git a/addons/base_contact/i18n/mn.po b/addons/base_contact/i18n/mn.po
deleted file mode 100644
index 6caf5c89447..00000000000
--- a/addons/base_contact/i18n/mn.po
+++ /dev/null
@@ -1,368 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-10-20 07:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Харьцах хүмүүс"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Өөрийн нэр:"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Хаяглах харилцагч"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Вэбсайт"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Гарчиг"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Суурь харьцах хүн"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "И-Мэйл"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Идэвхитэй"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Үндэстэн"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Үндсэн үүрэг"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Харилцагч, тэдний хаягыг тодорхойлох."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Хэл"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Гар утас"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Таны харьцдаг хүмүүс."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Нэмэлт мэдээлэл"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Үүрэг ба Хаягууд"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Харьцах хүн"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Таны харьцаг компаниуд"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Үндсэн ажил олгогч"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Харьцах хүн"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Хаягууд"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Ажлын болон хувийн хаягууд."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Эцгийн нэр"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Ерөнхий"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Харилцагч"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Харилцагч"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Төрсөн огноо"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-#~ "болохгүй!"
-
-#~ msgid "Other"
-#~ msgstr "Бусад"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Харьцах хүмүүс, үүргийг тодорхойлно."
-
-#~ msgid "# of Contacts"
-#~ msgstr "Харьцах хүмүүсийн тоо"
-
-#~ msgid "Phone"
-#~ msgstr "Утас"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "Function"
-#~ msgstr "Үүрэг"
-
-#~ msgid "Fax"
-#~ msgstr "Факс"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Нэмэлт утас"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Харьцах хүний үүрэг"
-
-#~ msgid "Address"
-#~ msgstr "Хаяг"
-
-#~ msgid "Seq."
-#~ msgstr "Д/д."
-
-#~ msgid "Main Job"
-#~ msgstr "Үндсэн ажил"
-
-#~ msgid "Categories"
-#~ msgstr "Ангилалууд"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Дотоод/Гадаад өргөтгөл дугаар"
-
-#~ msgid "Extension"
-#~ msgstr "Өргөтгөл"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Харилцагчийн холбоосууд"
-
-#~ msgid "General Information"
-#~ msgstr "Ерөнхий мэдээлэл"
-
-#~ msgid "State"
-#~ msgstr "Төлөв"
-
-#~ msgid "Date Start"
-#~ msgstr "Эхлэх огноо"
-
-#~ msgid "Partner Function"
-#~ msgstr "Харилцагчийн үүрэг"
-
-#~ msgid "Date Stop"
-#~ msgstr "Дуусах огноо"
-
-#~ msgid "Contact to function"
-#~ msgstr "Хариуцах хүн"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Харицагчийн Д/д."
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Харьцах хүний ажил"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "Хаягын жагсаалтад эрэмбэлэгдэх байрлал"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Үүрэг болон хаяг тодорхойлох."
-
-#~ msgid "Function to address"
-#~ msgstr "Хаяглах албан тушаал"
-
-#~ msgid "Current"
-#~ msgstr "Одоо"
-
-#~ msgid "Past"
-#~ msgstr "Өмнөх"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Гэрээний дараалал"
diff --git a/addons/base_contact/i18n/nb.po b/addons/base_contact/i18n/nb.po
deleted file mode 100644
index 364fecfcb19..00000000000
--- a/addons/base_contact/i18n/nb.po
+++ /dev/null
@@ -1,388 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-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: 2011-04-06 16:16+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakter"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Fornavn"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partner til adresse"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Nettside"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Tittel"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Grunnleggende kontakt"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-post"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktiv"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nasjonalitet"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Postadresse"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Hovedfunksjon"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definer partnere og deres adresser"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Navn"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Språk"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notater"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Arbeidskollegaer"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Ekstra informasjon"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Roller og adresser"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Firmaer du jobber sammen med."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Hovedarbeidsgiver"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Partnerkontakt"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adresser"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Adresser (privat og arbeid)"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Etternavn"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Bilde"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Generell"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partnere"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partner adresser"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Fødselsdag"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# kontakter"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "title"
-#~ msgstr "tittel"
-
-#~ msgid "Job FAX no."
-#~ msgstr "Jobb FAX no."
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definer funksjon og adresse"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Jobber på samme partneradresse."
-
-#~ msgid "Date Stop"
-#~ msgstr "Sluttdato"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Kontaktens jobb"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorier"
-
-#~ msgid "Extension"
-#~ msgstr "Internnummer"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Internt/ Eksternt telefonnummer"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Jobb e-post"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partnersekvens"
-
-#~ msgid "Function to address"
-#~ msgstr "Funksjon til adresse"
-
-#~ msgid "Communication"
-#~ msgstr "Kommunikasjon"
-
-#~ msgid "Past"
-#~ msgstr "Forrige"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Kontaktsekvens"
-
-#~ msgid "Search Contact"
-#~ msgstr "Søk kontakt"
-
-#~ msgid "Partner Function"
-#~ msgstr "Partnerfunksjon"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Tilleggfelt for telefon"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Kontaktfunksjoner"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Seq."
-#~ msgstr "Sekvens"
-
-#~ msgid "Current"
-#~ msgstr "Nåværende"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Kontakt partnerfunksjon"
-
-#~ msgid "Other"
-#~ msgstr "Andre"
-
-#~ msgid "Function"
-#~ msgstr "Funksjon"
-
-#~ msgid "Main Job"
-#~ msgstr "Hovedjobb"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Definer kontakter og funksjoner"
-
-#~ msgid "Contact to function"
-#~ msgstr "Kontakt til funksjon"
-
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
-#~ msgid "Date Start"
-#~ msgstr "Startdato"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Objektnavnet må starte med x_ og ikke inneholde noen spesialtegn!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ugyldig modellnavn i handlingsdefinisjonen"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ugyldig XML for visning av arkitektur!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Grunnleggende kontaktprosess"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Partnerkontakter"
-
-#~ msgid "General Information"
-#~ msgstr "Generell informasjon"
-
-#~ msgid "State"
-#~ msgstr "Status"
diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po
deleted file mode 100644
index e029b2d8e3f..00000000000
--- a/addons/base_contact/i18n/nl.po
+++ /dev/null
@@ -1,528 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-21 18:28+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#~ msgid "Categories"
-#~ msgstr "Categorieën"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "Stad"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr "Voornaam/achternaam"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactpersonen"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr "Professionele info"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Voornaam"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr "Locatie"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Relatie op adres"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Als het actief veld uitstaat kunt u de contactpersoon verbergen zonder te "
-"verwijderen."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Website"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "Postcode"
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr "Provincie"
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Titel"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr "Hoofd relatie"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Basiscontactpersoon"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Actief"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nationaliteit"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Postadres"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Hoofdfunctie"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Beheer relaties en hun adressen"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Naam"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Taal"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobiel"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "Land"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notities"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Collega's"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Extra informatie"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Functies en adressen"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contactpersoon"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr "res.partner.location"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Bedrijven waarmee u samenwerkt."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Hoofdwerkgever"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contactpersoon relatie"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adressen"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Zakelijke- en privé-adressen"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Achternaam"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr "Locaties"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Algemeen"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "Adres"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Relatie"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Relaties"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Relatieadressen"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr "Adres 2"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "Persoonlijke informatie"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Geboortedatum"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Partner Function"
-#~ msgstr "Functie"
-
-#~ msgid "Current"
-#~ msgstr "Actueel"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Functie contactpersoon"
-
-#~ msgid "Function"
-#~ msgstr "Functie"
-
-#~ msgid "Phone"
-#~ msgstr "Telefoon"
-
-#~ msgid "Date Stop"
-#~ msgstr "Einddatum"
-
-#~ msgid "Address"
-#~ msgstr "Adres"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Basis contactpersoon proces"
-
-#~ msgid "Function to address"
-#~ msgstr "Functie naar adres"
-
-#~ msgid "State"
-#~ msgstr "Status"
-
-#~ msgid "Past"
-#~ msgstr "Voorgaande"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Functies op hetzelfde adres"
-
-#~ msgid "Date Start"
-#~ msgstr "Begindatum"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Beheer functies en adressen"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Reeks relatie"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Reeks contactpersoon"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Beheer contactpersonen en functies."
-
-#~ msgid "# of Contacts"
-#~ msgstr "Aantal contactpersonen"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Extra telefoonveld"
-
-#~ msgid "Main Job"
-#~ msgstr "Hoofdfunctie"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Volgorde op belang van deze functie in de lijst van functies van de "
-#~ "gekoppelde relatie"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Volgorde op belang van dit adres in de lijst van adressen van de gekoppelde "
-#~ "contactpersoon"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Functies contactpersoon"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Functies van contactpersoon"
-
-#~ msgid "Seq."
-#~ msgstr "Reeks"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Intern/extern nakiesnummer"
-
-#~ msgid "Extension"
-#~ msgstr "Nakiesnummer"
-
-#~ msgid "General Information"
-#~ msgstr "Algemene informatie"
-
-#~ msgid "Other"
-#~ msgstr "Anders"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contactpersonen op functie"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de actie-definitie."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave!"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactpersonen relatie"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Volgorde van belangrijkheid van deze functie in de functielijst van de "
-#~ "gekoppelde relatie"
-
-#~ msgid "Migrate"
-#~ msgstr "Migreren"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "U mag eerst het adres invullen; relatie wordt automatisch gekoppeld indien "
-#~ "aanwezig."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Werk FAX nr."
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Functie van deze contactpersoon bij deze relatie"
-
-#~ msgid "Status of Address"
-#~ msgstr "Status van het adres"
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Startdaum dienstbetrekking (datum in dienst)"
-
-#~ msgid "Last date of job"
-#~ msgstr "Einddatum dienstbetrekking (datum uit dienst)"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Anders zijn deze details niet zichtbaar vanuit adres/contactpersoon."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adres dat is gekoppeld aan de relatie"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Als gevolg van wijzigingen in Adres en Relatie verhouding, moeten sommige "
-#~ "adresdetails worden gemigreerd naar contactpersoon informatie."
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Werk E-mail"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Werk Telefoon nr."
-
-#~ msgid "Search Contact"
-#~ msgstr "Zoek contactpersoon"
-
-#~ msgid "Image"
-#~ msgstr "Afbeelding"
-
-#~ msgid "Communication"
-#~ msgstr "Communicatie"
-
-#~ msgid "Address Migration"
-#~ msgstr "Adresmigratie"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Open vacatures"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Wilt u uw adresgegevens migreren naat contactpersoongegevens?"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Als u dit selecteert, worden alle adressen gemigreerd."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Configuratievoortgang"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Volgorde van belangrijkheid van dit adres in de adressenlijst van de "
-#~ "gekoppelde contactpersoon"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Selecteer de optie voor adressen migratie"
-
-#~ msgid "Configure"
-#~ msgstr "Configureren"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr ""
-#~ "U kunt de huidige adressen van de relatie migreren naar de contactpersoon."
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migratie adressen naar contactpersonen"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Met deze module kunt u al uw contactpersonen beheren.\n"
-#~ "\n"
-#~ "    U kunt definieren\n"
-#~ "        *contactpersonen niet gerelateerd aan een relatie,\n"
-#~ "        *contactpersonen die werken op meer adressen (mogelijk voor "
-#~ "verschillende relaties),\n"
-#~ "        *contactpersonen met mogelijk verschillende functies voor elk "
-#~ "werkadres\n"
-#~ "\n"
-#~ "    Ook worden nieuwe menu items toegevoegd in\n"
-#~ "        Relaties \\ Contactpersonen\n"
-#~ "        Relaties \\ Functies\n"
-#~ "\n"
-#~ "    Let op dat deze module bestaande adressen omzet naar \"adressen + "
-#~ "contactpersonen\". Dit betekent dat sommige velden van de adressen missen "
-#~ "(zoals de contactpersoonnaam) omdat ze zijn gedefinieerd in een ander "
-#~ "object.\n"
-#~ "    "
diff --git a/addons/base_contact/i18n/nl_BE.po b/addons/base_contact/i18n/nl_BE.po
deleted file mode 100644
index fab0bd07ce9..00000000000
--- a/addons/base_contact/i18n/nl_BE.po
+++ /dev/null
@@ -1,268 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-04-24 15:18+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
diff --git a/addons/base_contact/i18n/oc.po b/addons/base_contact/i18n/oc.po
deleted file mode 100644
index 5218c051fc5..00000000000
--- a/addons/base_contact/i18n/oc.po
+++ /dev/null
@@ -1,354 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-03 01:33+0000\n"
-"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
-"Language-Team: Occitan (post 1500) <oc@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:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactes"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Pichon nom"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partenari cap a adreça"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Site web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Títol"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Basa Contacte"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Corrièr electronic"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Actiu"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalitat"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Foncion principala"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Lenga"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Telefonet"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Informacion suplementària"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Foncions e adreças"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contacte"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Emplegaire principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacte del partenari"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adreças"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Nom d'ostal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partenari"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partenaris"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Data de naissença"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
-#~ "especials !"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Other"
-#~ msgstr "Autre"
-
-#~ msgid "Phone"
-#~ msgstr "Telefòn"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom del Modèl invalid per la definicion de l'accion."
-
-#~ msgid "Function"
-#~ msgstr "Foncion"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Address"
-#~ msgstr "Adreça"
-
-#~ msgid "Categories"
-#~ msgstr "Categorias"
-
-#~ msgid "Extension"
-#~ msgstr "Extension"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid per l'arquitectura de la vista"
-
-#~ msgid "General Information"
-#~ msgstr "Informacions generalas"
-
-#~ msgid "State"
-#~ msgstr "Estat"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Definir los contactes e lors foncions"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Foncion del contacte del partenari"
-
-#~ msgid "Partner Function"
-#~ msgstr "Foncion del partenari"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# de contactes"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contacte cap a foncion"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Seq. del partenari"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Seq. del contacte"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Foncions del contacte"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Foncions dels contactes"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Tractar los contactes de basa"
-
-#~ msgid "Main Job"
-#~ msgstr "Emplec principal"
-
-#~ msgid "Date Stop"
-#~ msgstr "Data de fin d'emplec"
-
-#~ msgid "Seq."
-#~ msgstr "Seq."
-
-#~ msgid "Function to address"
-#~ msgstr "Foncion cap a adreça"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactes del partenari"
-
-#~ msgid "Date Start"
-#~ msgstr "Data de començament"
diff --git a/addons/base_contact/i18n/pl.po b/addons/base_contact/i18n/pl.po
deleted file mode 100644
index 29482147ade..00000000000
--- a/addons/base_contact/i18n/pl.po
+++ /dev/null
@@ -1,508 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-14 13:26+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakty"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Imię"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Adres do partnera"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Jeśli pole Aktywne jest odznaczone, to kontakt nie będzie widoczny (nie "
-"musisz go usuwać)."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Strona internetowa"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Tytuł"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Kontakt główny"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktywny"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Narodowość"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Adresy pocztowy"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Główna funkcja"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definiuj partnerów i ich adresy."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nazwa"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Język"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Telefon komórkowy"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notatki"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Ludzie, z którymi współpracujesz"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Dodatkowe informacje"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funkcje i adresy"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Firmy, z którymi współpracujesz."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Główny pracodawca"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Kontakt do partnera"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adresy"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Adresy służbowe i prywatne"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Nazwisko"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Zdjęcie"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Ogólne"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partnerzy"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adres partnera"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Data urodzenia"
-
-#~ msgid "Main Job"
-#~ msgstr "Główna praca"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Definiuje kontakty i funkcje."
-
-#~ msgid "Current"
-#~ msgstr "Bieżący"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Function"
-#~ msgstr "Funkcja"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Address"
-#~ msgstr "Adres"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#~ msgid "General Information"
-#~ msgstr "Informacje ogólne"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Funkcja osoby u partnera"
-
-#~ msgid "Contact to function"
-#~ msgstr "Kontakt do funkcji"
-
-#~ msgid "Other"
-#~ msgstr "Inna"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Nr sekw. partnera"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Nr sekw. kontaktu"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funkcja u partnera"
-
-#~ msgid "Fax"
-#~ msgstr "Faks"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Dodatkowe pole telefonu"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# kontaktów"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr "Kolejność wg ważności tego tytułu na liście tytułów partnera"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "Kolejność wg ważności tego adresu na liście adresów kontaktu"
-
-#~ msgid "Date Stop"
-#~ msgstr "Data zakończenia"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funkcje kontaktu"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proces głównego kontaktu"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorie"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Numer wewnętrzny"
-
-#~ msgid "Extension"
-#~ msgstr "Rozszerzenie"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Kontakty do partnera"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definiuj funkcje i adres"
-
-#~ msgid "State"
-#~ msgstr "Stan"
-
-#~ msgid "Seq."
-#~ msgstr "Num."
-
-#~ msgid "Past"
-#~ msgstr "Poprzednio"
-
-#~ msgid "Date Start"
-#~ msgstr "Data rozpoczęcia"
-
-#~ msgid "Migrate"
-#~ msgstr "Migracja"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Możesz wprowadzić najpierw adres. Partner zostanie dołączony automatycznie, "
-#~ "jeśli jet."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Faks do pracy"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Funkcja tego kontaktu dla tego partnera"
-
-#~ msgid "Status of Address"
-#~ msgstr "Stan adresu"
-
-#~ msgid "title"
-#~ msgstr "tytuł"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Data rozpoczęcia pracy"
-
-#~ msgid "Last date of job"
-#~ msgstr "Data zakończenia pracy"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Wybierz opcję do migracji adresów"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Stanowiska kontaktu"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Postęp konfiguracji"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "E-mail stanowiska"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Numer tel. stanowiska"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr "Ranga tego stanowiska w tytułach w liście stanowisk partnera."
-
-#~ msgid "Communication"
-#~ msgstr "Komunikacja"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Stanowiska pod tym samym adresem partnera"
-
-#~ msgid "Function to address"
-#~ msgstr "Funkcja do adresu"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr ""
-#~ "W przeciwnym przypadku szczegóły nie będą widoczne w adresach/kontaktach."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adres związany z partnerem"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Ze względu na zmiany w relacjach adresy - partnerzy, część informacji "
-#~ "adresowych jest potrzebna do migracji."
-
-#~ msgid "Search Contact"
-#~ msgstr "Szukaj kontaktu"
-
-#~ msgid "Image"
-#~ msgstr "Obraz"
-
-#~ msgid "Configure"
-#~ msgstr "Konfiguruj"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Chcesz migrować adresy do kontaktów?"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migracja adresów do kontaktół"
-
-#~ msgid "Address Migration"
-#~ msgstr "Migracja adresów"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Otwórz stanowiska"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Jeśli to zaznaczysz, to wszystkie adresy będa migrowane"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Możesz migrowac obecne adresy partnerów do kontaktów"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "Ranga tego adresu w liście adresów tego kontaktu"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Ten moduł pozwala zarządzać kontaktami.\n"
-#~ "\n"
-#~ "    Pozwala definiować\n"
-#~ "        * kontakty niezwiązane z partnerem,\n"
-#~ "        * kontakty działające pod różnymi adresami (dla różnych partnerów),\n"
-#~ "        * kontakty z różnymi funkcjami dla każdego ze stanowisk\n"
-#~ "\n"
-#~ "    Dodaje nowe menu\n"
-#~ "        Partnerzy \\ Kontakty\n"
-#~ "        Partnerzy \\ Funkcje\n"
-#~ "\n"
-#~ "    OSTRZEŻENIE: Przy konwersji adresów na kontakty niektóre pola adresów "
-#~ "znikną (np. Nazwa kontaktu).\n"
-#~ "    "
diff --git a/addons/base_contact/i18n/pt.po b/addons/base_contact/i18n/pt.po
deleted file mode 100644
index 137264dbf26..00000000000
--- a/addons/base_contact/i18n/pt.po
+++ /dev/null
@@ -1,406 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-15 03:40+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Nome próprio"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Terceiro a endereçar"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Página Web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contacto base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidade"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Função Principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Defina os terceiros e seus endereços"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Língua"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Telemóvel"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Observações"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Pessoas com quem trabalha."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Informação Extra"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funções e Endereços"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas com que trabalha"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Funcionário Principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contacto do Terceiro"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Endereços"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Endereços funcionais e privados."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Último Nome"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Fotografia"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Geral"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Terceiro"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Terceiros"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Endereços do Terceiro"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Data do Nascimento"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Seq. Contacto"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Function"
-#~ msgstr "Função"
-
-#~ msgid "Phone"
-#~ msgstr "Telefone"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Define contactos e funções"
-
-#~ msgid "Address"
-#~ msgstr "Endereço"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Ordem de importância deste endereço na lista de endereços do cliente "
-#~ "relacionado"
-
-#~ msgid "Categories"
-#~ msgstr "Categorias"
-
-#~ msgid "Seq."
-#~ msgstr "Seq."
-
-#~ msgid "Function to address"
-#~ msgstr "Função a endereçar"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Past"
-#~ msgstr "Passado"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Trabalhos no mesmo endereço do terceiro."
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definir funções e endereços"
-
-#~ msgid "Other"
-#~ msgstr "Outro"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Extension"
-#~ msgstr "Extensão"
-
-#~ msgid "Partner Function"
-#~ msgstr "Função do Terceiro"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Seq. Terceiro"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Função do Contacto do Terceiro"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contacto para função"
-
-#~ msgid "# of Contacts"
-#~ msgstr "Nº de Contactos"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Campo de Telefone Adicional"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funções do Contacto"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Ordem de importância deste título de trabalho na lista de título de trabalho "
-#~ "do terceiro relacionado"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Trabalho do Contacto"
-
-#~ msgid "Main Job"
-#~ msgstr "Trabalho Principal"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Processo do Contacto Base"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Extensão externa do número de telefone/Interno"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contactos do Terceiro"
-
-#~ msgid "General Information"
-#~ msgstr "Informação Geral"
-
-#~ msgid "Date Start"
-#~ msgstr "Data de Inicio"
-
-#~ msgid "Migrate"
-#~ msgstr "Migrar"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Search Contact"
-#~ msgstr "Pesquisar contacto"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Processo de configuração"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Endereço associado ao Terceiro"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "Current"
-#~ msgstr "Atual"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
-
-#~ msgid "Date Stop"
-#~ msgstr "Data de término"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitetura da vista"
diff --git a/addons/base_contact/i18n/pt_BR.po b/addons/base_contact/i18n/pt_BR.po
deleted file mode 100644
index 89d880cc783..00000000000
--- a/addons/base_contact/i18n/pt_BR.po
+++ /dev/null
@@ -1,527 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 19:46+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contatos"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Primeiro Nome"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Endereço do Parceiro"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Se o campo ativo é definido como falso, isso permitirá que você ocultar o "
-"contato do parceiro sem removê-lo."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Página da Web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contato Base"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Ativo"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalidade"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Endereço Postal"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Função Principal"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definir Parceiros e seus Endereços"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Idioma"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Celular"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "As pessoas com quem trabalha."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Informação Extra"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funções e Endereços"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contato"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Empresas com as quais você trabalha."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Principal Empregador"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contato do Parceiro"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Endereços"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Endereços de trabalho e privado."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Sobrenome"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Geral"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Parceiros"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Endereços do parceiro"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Data de Nascimento"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Partner Function"
-#~ msgstr "Função do parceiro"
-
-#~ msgid "Current"
-#~ msgstr "Atual"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Função do contato do parceiro"
-
-#~ msgid "Contact to function"
-#~ msgstr "Função do Contato"
-
-#~ msgid "Function"
-#~ msgstr "Função"
-
-#~ msgid "Phone"
-#~ msgstr "Telefone"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Definir Contatos e Funções"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funções do Contato"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Ordem de importância deste cargo, na lista de postos de trabalho ligados a "
-#~ "título de parceiro"
-
-#~ msgid "Date Stop"
-#~ msgstr "Data de Parada"
-
-#~ msgid "Address"
-#~ msgstr "Endereço"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Ordem de importância deste endereço na lista de endereços ligados aos "
-#~ "contatos"
-
-#~ msgid "Categories"
-#~ msgstr "Categorias"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalido XML para Arquitetura da View"
-
-#~ msgid "Seq."
-#~ msgstr "Seq."
-
-#~ msgid "Function to address"
-#~ msgstr "Função de Tratar"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contatos do Parceiro"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Past"
-#~ msgstr "Passado"
-
-#~ msgid "General Information"
-#~ msgstr "Informação Básica"
-
-#~ msgid "Date Start"
-#~ msgstr "Data de Início"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definir Funções e Endereços"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Processo de Contato Base"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Numero do Ramal Interno/Externo"
-
-#~ msgid "Extension"
-#~ msgstr "Extensão"
-
-#~ msgid "Other"
-#~ msgstr "Outro"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Seq. Parceiro"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Seq. Contato"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Trabalhos do Contato"
-
-#~ msgid "Main Job"
-#~ msgstr "Trabalho Principal"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Trabalhos em um mesmo endereço de parceiro."
-
-#~ msgid "# of Contacts"
-#~ msgstr "Num. de Contatos"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação"
-
-#~ msgid "Migrate"
-#~ msgstr "Migrar"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto deve iniciar com x_ e não conter nenhum caracter especial."
-
-#~ msgid "Additional phone field"
-#~ msgstr "Campo de Telefone adicional"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Você deseja migrar seus dados de endereço para os dados do contato?"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "E-Mail do trabalho"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Nro do telefone do trabalho"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicação"
-
-#~ msgid "Search Contact"
-#~ msgstr "Pesquisar Contatos"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Você pode informar endereços primeiro, Os parceiros serão vinculados "
-#~ "automaticamente se existir algum."
-
-#~ msgid "Job FAX no."
-#~ msgstr "FAX"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "A função deste contato com este parceiro"
-
-#~ msgid "Status of Address"
-#~ msgstr "Situação do Endereço"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Data de Início do Trabalho (Unindo Datas)"
-
-#~ msgid "Last date of job"
-#~ msgstr "Último dia de Trabalho"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Ordem de importância deste título de trabalho na lista de títulos de "
-#~ "trabalho do parceiro vinculado"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr ""
-#~ "Caso contrário estes detalhes de endereço/contato não estarão visíveis."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Endereço que está vinculado ao Parceiro"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Devido a alterações nos Endereços e relacionamentos de Parceiros, alguns "
-#~ "detalhes dos endereços precisam ser migrados para as informações do contato."
-
-#~ msgid "Open Jobs"
-#~ msgstr "Trabalhos Abertos"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Se você selecionar isso, todos os endereços serão migrados."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Ordem de importância deste endereço na lista de endereços vinculada ao "
-#~ "contato"
-
-#~ msgid "Address Migration"
-#~ msgstr "Migração de Endereço"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Selecione a Opção para Migração de Endereços"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Você pode migrar os endereços atuais de Parceiros para o contato."
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migração de Endereços para Contatos"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Este módulo permite o gerenciamento completo dos contatos.\n"
-#~ "\n"
-#~ "    permite você definir\n"
-#~ "        *contatos sem relação com parceiros,\n"
-#~ "        *contatos operando em vários endereços (possivelmente em parceiros "
-#~ "diferentes),\n"
-#~ "        *contatos com possibilidade de diferentes funções para cada um dos "
-#~ "endereços de trabalho\n"
-#~ "\n"
-#~ "    também adiciona novos itens de menus em\n"
-#~ "        Parceiros \\ Contatos\n"
-#~ "        Parceiros \\ Funções\n"
-#~ "\n"
-#~ "    Repare que este módulo converte os endereços existentes em \"endereço + "
-#~ "contato\". Isto significa que alguns campos de endereço sairão (como o nome "
-#~ "do contato), uma vez que se supõe que o nome está no outro objeto.\n"
-#~ "    "
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progresso da Configuração"
diff --git a/addons/base_contact/i18n/ro.po b/addons/base_contact/i18n/ro.po
deleted file mode 100644
index 90072064202..00000000000
--- a/addons/base_contact/i18n/ro.po
+++ /dev/null
@@ -1,527 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-17 11:58+0000\n"
-"Last-Translator: Syraxes <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Contacte"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Prenume"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partener la adresă"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Daca campul activ este setat pe Fals, va va permite sa ascundeti contactul "
-"partenerului fara a-l sterge."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Website"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Titlu"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Contact de bază"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Activ"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Naţionalitate"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Adresa poștală"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Funcţia principală"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definire parteneri și adresele lor"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Nume"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Limbă"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Pesoane cu care lucraţi."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Informaţii suplimentare"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funcții și adrese"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Contact"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Companii cu care lucrați"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Angajator principal"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Contact partener"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adrese"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Adrese la locul de muncă şi private"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Nume"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Poză"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "General"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partener"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Parteneri"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adresele partenerului"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Data nașterii"
-
-#~ msgid "Categories"
-#~ msgstr "Categorii"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# de contacte"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Function"
-#~ msgstr "Funcție"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Cămp adițional pentru telefon"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Definește contactele și funcțiile"
-
-#~ msgid "Other"
-#~ msgstr "Alte"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Ordinea importanței acestei adrese în lista de adrese a contactului asociat"
-
-#~ msgid "Date Stop"
-#~ msgstr "Data de sfârșit"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funcțiile contactului"
-
-#~ msgid "Seq."
-#~ msgstr "Secvență"
-
-#~ msgid "Extension"
-#~ msgstr "Extensie"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definire funcții și adrese"
-
-#~ msgid "State"
-#~ msgstr "Stare"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Locuri de muncă la aceeași adresă partener"
-
-#~ msgid "Past"
-#~ msgstr "Anterior"
-
-#~ msgid "Date Start"
-#~ msgstr "Data de început"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Funcția contactului la partener"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funcție la partener"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-#~ "special !"
-
-#~ msgid "Contact to function"
-#~ msgstr "Contact în funcţie"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nume invalid de model în definirea acţiunii"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Secvență parteneri"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Secvență contacte"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Ordinea importanței poziţiei in lista de poziţii la partenerul asociat"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Funcţia contactului"
-
-#~ msgid "Main Job"
-#~ msgstr "Sarcina principală"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#~ msgid "Address"
-#~ msgstr "Adresă"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Proces contact de bază"
-
-#~ msgid "Function to address"
-#~ msgstr "Funcţie la adresă"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Contacte partener"
-
-#~ msgid "General Information"
-#~ msgstr "Informaţii generale"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Număr telefon extensie internă/externă"
-
-#~ msgid "title"
-#~ msgstr "titlu"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Toate adresele vor fi migrate dacă selectaţi acestă opţiune."
-
-#~ msgid "Status of Address"
-#~ msgstr "Situație adresă"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adresa asociată Partenerului"
-
-#~ msgid "Search Contact"
-#~ msgstr "Căutare contact"
-
-#~ msgid "Image"
-#~ msgstr "Imagine"
-
-#~ msgid "Communication"
-#~ msgstr "Comunicare"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Din cauza modificării relaţiei definită între entităţile Adresă şi Partener, "
-#~ "este necesar ca o parte dintre detaliile adresei să fie migrate  la "
-#~ "detaliile de contact."
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Puteţi introduce adresa.  Partenerul va fi setat automat, dacă există."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Migrate"
-#~ msgstr "Migrează"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Configurare procese"
-
-#~ msgid "Configure"
-#~ msgstr "Configurare"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "E-mail loc de munca"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Nr de telefon loc de munca"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Ordinea importantei acestui titlu al locului de munca in lista cu titluri de "
-#~ "locuri de munca a partenerului asociat"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Acest modul va permite sa va gestionati contactele in intregime. \n"
-#~ "\n"
-#~ "Va permite sa definiti \n"
-#~ "          *contacte fara legatura cu un partener, \n"
-#~ "          * contacte lucrand la mai multe adrese (posibil pentru parteneri "
-#~ "diferiti), \n"
-#~ "          * contacte cu functii diferite probabil pentru fiecare dintre "
-#~ "adresele locului de munca \n"
-#~ "\n"
-#~ "De asemenea, adauga noi elemente ale meniului localizate in \n"
-#~ "          Parteneri \\ Contacte \n"
-#~ "          Parteneri \\ FUnctii \n"
-#~ "\n"
-#~ "Fiti atent deoarece acest modul schimba adresele existente in "
-#~ "\"adrese+contacte\". Aceasta inseamna ca unele campuri ale adreselor vor "
-#~ "lipsi (cum ar fi numele contactului), din moment ce acestea ar trebui sa fie "
-#~ "definite intr-un alt obiect.\n"
-#~ "    "
-
-#~ msgid "Job FAX no."
-#~ msgstr "Nr. FAX al locului de munca"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Functia acestui contact cu acest partener"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Data de inceput a locului de munca (data angajarii)"
-
-#~ msgid "Last date of job"
-#~ msgstr "Ultima data a locului de munca"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr ""
-#~ "In mod contrar, aceste detalii nu vor fi vizibile din adresa/contact."
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Ordinea importantei acestei adrese in lista cu adrese a contactului asociat"
-
-#~ msgid "Address Migration"
-#~ msgstr "Migrare adresa"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Deschidere Locuri de munca"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr ""
-#~ "Doriti sa migrati datele adresei dumneavoastra in Datele Contactului?"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Adresa de migrare in Contacte"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Puteti migra adresele curente ale Partenerului in contact."
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Selectati optiunea pentru Migrarea adresei"
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
deleted file mode 100644
index e700018c344..00000000000
--- a/addons/base_contact/i18n/ru.po
+++ /dev/null
@@ -1,519 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-30 16:46+0000\n"
-"Last-Translator: Aleksei Motsik <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "Город"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr "Имя/Фамилия"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Контакты"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr "Профессия"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Имя"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr "Местоположение"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Адрес партнера"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Если поле 'Активно' имеет значение ложь, то это позволит вам скрыть контакт "
-"партнера, не удаляя его."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Сайт"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "Индекс"
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr "Штат"
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "Компания"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Название"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr "Основной партнер"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Основной контакт"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Эл. почта"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Активен"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Национальность"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Почтовый адрес"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Личная функция"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Определить партнеров и их адреса."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Имя"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Язык"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Моб. тел."
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "Страна"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Примечания"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Люди с которыми вы работает"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Доп. информация"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Функции и Адреса"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Контакт"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Организации с которыми вы работаете"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Основной работодатель"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Контакт партнера"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Адреса"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Рабочие и дополнительные адреса."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Фамилия"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Фото"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr "Местоположения"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Основной"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "Улица"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Партнер"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Партнеры"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Адреса партнера"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr "Улица (2-я строка)"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "Личная информация"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Дата рождения"
-
-#~ msgid "# of Contacts"
-#~ msgstr "Кол-во контактных лиц"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Function"
-#~ msgstr "Функция"
-
-#~ msgid "Phone"
-#~ msgstr "Телефон"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Функции контакта"
-
-#~ msgid "Address"
-#~ msgstr "Адрес"
-
-#~ msgid "Categories"
-#~ msgstr "Категории"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "General Information"
-#~ msgstr "Общая информация"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Функции сотрудника партнера"
-
-#~ msgid "Contact to function"
-#~ msgstr "Функции контакта"
-
-#~ msgid "Current"
-#~ msgstr "Текущий"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "Контакт партнера"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Последовательность партнеров"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Последовательность контакта"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Определить контакты и функции"
-
-#~ msgid "Partner Function"
-#~ msgstr "Функции партнера"
-
-#~ msgid "Fax"
-#~ msgstr "Факс"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Дополнительное поле телефона"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Должность контакта"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "С учетом важности этой работы названия в списке Должность связанного партнера"
-
-#~ msgid "Date Stop"
-#~ msgstr "Дата Остановки"
-
-#~ msgid "Main Job"
-#~ msgstr "Основная должность"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Основной контакт"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Внутренний / внешний расширение телефонного номера"
-
-#~ msgid "Extension"
-#~ msgstr "Расширение"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Контакты партнера"
-
-#~ msgid "State"
-#~ msgstr "Состояние"
-
-#~ msgid "Past"
-#~ msgstr "Прошлые"
-
-#~ msgid "Date Start"
-#~ msgstr "Дата начала"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "Other"
-#~ msgstr "Другое"
-
-#~ msgid "Seq."
-#~ msgstr "Посл-ть"
-
-#~ msgid "Function to address"
-#~ msgstr "Адрес функции"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "Уровень важности этого адреса в списке адресов связанного контакта"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Определить функции и адреса."
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Должности с таким же адресом партнера"
-
-#~ msgid "Status of Address"
-#~ msgstr "Статус адреса"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Иначе эти подробности не будут видны в адресе/контакте."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Адрес который связан с партнером"
-
-#~ msgid "Search Contact"
-#~ msgstr "Искать контакт"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "Порядок важности этого адреса в списке адресов связанного контакта"
-
-#~ msgid "Address Migration"
-#~ msgstr "Перенос адресов"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Открытые вакансии"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Вы хотите перенести данные вашего адреса в данные контакта ?"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Если вы выберете это, все адреса будут перенесены."
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Порядок важности этой должности в списке должностей связанного партнера"
-
-#~ msgid "Migrate"
-#~ msgstr "Переместить"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Вы можете сначала ввести адрес, партнер будет привязан автоматически, если "
-#~ "он есть."
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "В связи с изменениями в отношениях адресов и партнеров, некоторые данные из "
-#~ "адреса необходимо перенести в контакт."
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Настройка выполняется"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Должность этого контакта в фирме-партнере"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Communication"
-#~ msgstr "Общение"
-
-#~ msgid "Configure"
-#~ msgstr "Настройка"
-
-#~ msgid "Last date of job"
-#~ msgstr "Последний день работы"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Рабочий e-mail"
-
-#~ msgid "Job FAX no."
-#~ msgstr "Рабочий номер факса"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Выберите опции для перемещения адресов"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Рабочий телефон"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Вы можете переместить текущие адреса контрагента в контакт"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Дата начала работы(дата присоединения)"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Перенос адреса в контакты"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Этот модуль позволяет управлять контактами.\n"
-#~ "\n"
-#~ "    В нём можно определить\n"
-#~ "        *контакты, не связанные с контрагентом,\n"
-#~ "        *контакты с множеством адресов (возможно, для разных контрагентов),\n"
-#~ "        *контакты с различными функциями в зависимости от их адреса\n"
-#~ "\n"
-#~ "    Он добавляет пункты меню в разделы\n"
-#~ "        Контрагенты \\ Контакты\n"
-#~ "        Контрагенты \\ Функции\n"
-#~ "\n"
-#~ "    Внимание! Этот модуль преобразует существующие адреса в «адреса + "
-#~ "контакты». Это значит, что часть полей адреса будет утеряна (например, имя "
-#~ "контакта), поскольку ожидается их объявление в другом объекте.\n"
-#~ "    "
-
-#~ msgid "title"
-#~ msgstr "title"
diff --git a/addons/base_contact/i18n/sk.po b/addons/base_contact/i18n/sk.po
deleted file mode 100644
index 4f5077c5b71..00000000000
--- a/addons/base_contact/i18n/sk.po
+++ /dev/null
@@ -1,425 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-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: 2010-08-03 01:38+0000\n"
-"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakty"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Krstné meno"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Adresy partnera"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Webová stránka"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Názov"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Základný kontakt"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktívny"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Národnosť"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Poštová adresa"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Hlavná funkcia"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definovať partnerov a ich adresy."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Meno"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Jazyk"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Poznámky"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Ľudia s ktorými pracujete."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Extra informácie"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funkcie a adresy"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Spoločnosti s ktorými pracujete."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Hlavný zamestnávateľ"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Kontakt partnera"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adresy"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Pracovné a súkromné adresy."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Priezvisko"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Fotografia"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Všeobecné"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partneri"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partnerove adresy"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Dátum narodenia"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funkcia partnera"
-
-#~ msgid "Current"
-#~ msgstr "Aktuálne"
-
-#~ msgid "Other"
-#~ msgstr "Iné"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# z Kontaktov"
-
-#~ msgid "Phone"
-#~ msgstr "Telefón"
-
-#~ msgid "Function"
-#~ msgstr "Funkcia"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funkcie kontaktu"
-
-#~ msgid "Address"
-#~ msgstr "Adresa"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Základný proces kontaktu"
-
-#~ msgid "Categories"
-#~ msgstr "Kategórie"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Kontakty partnera"
-
-#~ msgid "State"
-#~ msgstr "Štát"
-
-#~ msgid "Date Start"
-#~ msgstr "Dátum spustenia"
-
-#~ msgid "Date Stop"
-#~ msgstr "Dátum ukončenia"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Seq."
-#~ msgstr "Por."
-
-#~ msgid "Partner Seq."
-#~ msgstr "Por. partnera"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Por. kontaktu"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Kontakt - funkcia partnera"
-
-#~ msgid "Contact to function"
-#~ msgstr "Funkcia kontaktu"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Neplatný názov modelu v definícii akcie."
-
-#~ msgid "Additional phone field"
-#~ msgstr "Dodatočné pole telefónu"
-
-#~ msgid "Main Job"
-#~ msgstr "Hlavná práca"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Interná / Externá klapka"
-
-#~ msgid "Extension"
-#~ msgstr "Rozšírenie"
-
-#~ msgid "Function to address"
-#~ msgstr "Funkcia na adresu"
-
-#~ msgid "General Information"
-#~ msgstr "Všeobecné informácie"
-
-#~ msgid "Past"
-#~ msgstr "Minulosť"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Práce na na rovnakej partnerovej adrese."
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definovanie funkcií a adries."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neplatné XML pre zobrazenie architektúry!"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Definovanie kontaktov a funkcií."
-
-#~ msgid "Migrate"
-#~ msgstr "Presunúť"
-
-#~ msgid "Job FAX no."
-#~ msgstr "FAX do práce č."
-
-#~ msgid "title"
-#~ msgstr "titul"
-
-#~ msgid "Last date of job"
-#~ msgstr "Posledný deň práce"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Email do práce"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Telefón do práce č."
-
-#~ msgid "Image"
-#~ msgstr "Obrázok"
-
-#~ msgid "Communication"
-#~ msgstr "Komunikácia"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Priebeh nastavenia"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adresa, ktorá je spojená s partnerom"
-
-#~ msgid "Search Contact"
-#~ msgstr "Hľadanie kontaktu"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "V opačnom prípade tieto údaje nebudú viditeľné z adresy / kontaktu."
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Ak vyberiete túto možnosť, budú všetky adresy presunuté."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Presun adries do kontaktov"
-
-#~ msgid "Configure"
-#~ msgstr "Nastaviť"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Poradie dôležitosti tejto adresy v zozname adries spojených s kontaktom"
-
-#~ msgid "Address Migration"
-#~ msgstr "Presun adresy"
diff --git a/addons/base_contact/i18n/sl.po b/addons/base_contact/i18n/sl.po
deleted file mode 100644
index b289fc99713..00000000000
--- a/addons/base_contact/i18n/sl.po
+++ /dev/null
@@ -1,522 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-16 17:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Stiki"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Ime"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Naslovljeni partner"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Če je aktivno polje nastavljeno na False, vam bo dovoljeno skrivanje "
-"kontakta partnerja brez, da bi ga odstranili."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Spletno mesto"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Titula"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Osnovni stik"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-pošta"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktivno"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Državljanstvo"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Poštni naslov"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Glavna funkcija"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Določi partnerje in njihove naslove"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Jezik"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobilni telefon"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Opombe"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "S katerimi ljudmi poslujete"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Dodatne informacije"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funkcije in naslovi"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Podjetja s katerimi delate."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Glavni zaposlovalec"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Stik partnerja"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Naslovi"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Delovni in zasebni naslovi"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Priimek"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Fotografija"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Splošno"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partnerji"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Naslovi stranke"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Rojstni datum"
-
-#~ msgid "# of Contacts"
-#~ msgstr "Število stikov"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#~ msgid "Function"
-#~ msgstr "Funkcija"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funkcije stika"
-
-#~ msgid "Address"
-#~ msgstr "Naslov"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorije"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#~ msgid "General Information"
-#~ msgstr "Splošne informacije"
-
-#~ msgid "Current"
-#~ msgstr "Trenutni"
-
-#~ msgid "Other"
-#~ msgstr "Drugo"
-
-#~ msgid "Fax"
-#~ msgstr "Faks"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Zap. partnerjev"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Zap. kontaktov"
-
-#~ msgid "Seq."
-#~ msgstr "Zap."
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Kontakti partnerja"
-
-#~ msgid "Date Start"
-#~ msgstr "Datum začetka"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Določa stike in funkcije"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Napačno ime modela v definiciji dejanja."
-
-#~ msgid "Additional phone field"
-#~ msgstr "Dodatno polje za telefon"
-
-#~ msgid "Past"
-#~ msgstr "Pretekli"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Službe stika"
-
-#~ msgid "Main Job"
-#~ msgstr "Glavno delo"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Funkcija stik partnerja"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funkcija partner"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Vrstni red pomembnosti tega delovnega mesta v seznamu delovnih mest "
-#~ "povezanega partnerja"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Vrstni red pomembnosti tega naslova v seznamu naslovov povezanega stika"
-
-#~ msgid "Contact to function"
-#~ msgstr "Stik h funkciji"
-
-#~ msgid "Date Stop"
-#~ msgstr "Datum konca"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Določi funkcije in naslove."
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Osnovni proces kontaktov"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Službe na istem naslovu partnerja"
-
-#~ msgid "Function to address"
-#~ msgstr "Nasloviti funkcijo"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Notranja/zunanja telefonska številka"
-
-#~ msgid "State"
-#~ msgstr "Stanje"
-
-#~ msgid "Search Contact"
-#~ msgstr "Išči po stikih"
-
-#~ msgid "Status of Address"
-#~ msgstr "Status naslova"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Če izberete to možnost, bodo prenešeni vsi naslovi"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Potek konfiguracije"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Ali želite prenesti podatke o vaših naslovih v podatke o stiku?"
-
-#~ msgid "Address Migration"
-#~ msgstr "Prenos naslova"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Službeni e-poštni naslov"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Službena telefonska številka"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Odprte zaposlitve"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Naslov, ki je povezan s stranko"
-
-#~ msgid "Migrate"
-#~ msgstr "Preseli"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "Job FAX no."
-#~ msgstr "Številka službenega faks-a:"
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Začetek zaposlitve"
-
-#~ msgid "Last date of job"
-#~ msgstr "Konec zaposlitve"
-
-#~ msgid "Extension"
-#~ msgstr "Razširitev"
-
-#~ msgid "Communication"
-#~ msgstr "Komunikacija"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "V nasprotnem primeru ti podatki ne bodo videni iz naslova / kontakt."
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Izberi možnost za migracijo naslovov"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Zaradi sprememb v  zvezi Naslov in Partner, so nekatere podrobnosti iz "
-#~ "naslova je bilo treba selili v kontaktne podatke."
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Vrstni red pomembnosti tega naziva delovnega mesta na seznamu nazivov od "
-#~ "povezanega partnerja"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Ta modul vam omogoča, da upravljate svoje stike v celoti.\n"
-#~ "\n"
-#~ "    Dovoli vam definirati\n"
-#~ "        * stiki, ki niso povezani s partnerjem,\n"
-#~ "        * stiki , ki delajo na več naslovih (lahko za različne partnerje),\n"
-#~ "        * stiki z morda različnimi funkcijami za vsak od naslovov kjer "
-#~ "delajo\n"
-#~ "\n"
-#~ "    Prav tako dodaja nove elemente menija, ki se nahajajo v\n"
-#~ "        Partnerji \\ Kontakti\n"
-#~ "        Partners \\ Funkcije\n"
-#~ "\n"
-#~ "    Bodite pozorni, da ta modul pretvarja obstoječe naslovov v \"naslovi + "
-#~ "stikov\". To pomeni, da bodo nekatera področja naslovov manjkala (kot je ime "
-#~ "stika), saj naj bi bila opredeljena v drug predmetu.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Lahko vnesete najprej naslov, partner bo samodejno povezan, če sploh."
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Funkcija tega stika s tem partnerjem"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Migracija naslovov kontaktov"
-
-#~ msgid "Configure"
-#~ msgstr "Nastavitve"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Lahko migrirate trenutni naslov partnerja k kontatku."
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr ""
-#~ "Vrstni red pomembnosti tega naslova na seznamu naslovov povezanih kontaktov"
diff --git a/addons/base_contact/i18n/sq.po b/addons/base_contact/i18n/sq.po
deleted file mode 100644
index fa7a889ca73..00000000000
--- a/addons/base_contact/i18n/sq.po
+++ /dev/null
@@ -1,264 +0,0 @@
-# Albanian translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-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: 2009-12-29 15:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
diff --git a/addons/base_contact/i18n/sr.po b/addons/base_contact/i18n/sr.po
deleted file mode 100644
index 5628666b284..00000000000
--- a/addons/base_contact/i18n/sr.po
+++ /dev/null
@@ -1,467 +0,0 @@
-# Serbian translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-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: 2010-10-30 14:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakti"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Ime"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partner na adresu"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Internet stranica"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Naslov"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Osnovni Kontakt"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktivan"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalnost"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Postanska adresa"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Glavna Funkcija"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definisi Partnere i njihove Adrese"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Jezik"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobilni"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Napomene"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Ljudi s kojima radite."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Dodatne informacije"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funkcije i Adrese"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Kompanije s kojima radite."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Glavni Poslodavac."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Kontakt partnera"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adrese"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Rad na Privatnoj adresi"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Prezime"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Fotografija"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Opšte"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partneri"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partnerove adrese"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Datum rođenja"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Funkcija Kontakta Partnera"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funkcija Partnera"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Current"
-#~ msgstr "Trenutni"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "es.partner.contact"
-
-#~ msgid "Other"
-#~ msgstr "Drugo"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partner Seq."
-
-#~ msgid "Contact Seq."
-#~ msgstr "Seq. Osobe"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Određuje Osobe i Funkcije"
-
-#~ msgid "Contact to function"
-#~ msgstr "Kontakt na funkciju"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "Function"
-#~ msgstr "Funkcija"
-
-#~ msgid "Fax"
-#~ msgstr "Faks"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Dodatno polje za Tel"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# Kontakata"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "redosled važnosti ovog naziva Posla-Radnog mesta u listi naziva Poslova-"
-#~ "Radnih mesta povezanog Partnera"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "redosled važnosti ove Adrese u listi Adresa povezanog Partnera"
-
-#~ msgid "Date Stop"
-#~ msgstr "Datum Završetka"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funkcije Osoba"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Poslovi kontakta"
-
-#~ msgid "Address"
-#~ msgstr "Adresa"
-
-#~ msgid "Seq."
-#~ msgstr "Sekv."
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Postupak Osnovnog Kontakta"
-
-#~ msgid "Main Job"
-#~ msgstr "Glavni Posao"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorije"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Interna/Externa Ekstenzija Tel. broja"
-
-#~ msgid "Extension"
-#~ msgstr "Dodatak"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Kontakti partnera"
-
-#~ msgid "Function to address"
-#~ msgstr "Funkcija na Adresu"
-
-#~ msgid "State"
-#~ msgstr "Stanje"
-
-#~ msgid "General Information"
-#~ msgstr "Opšte informacije"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Poslovi na istoj Adresi Partnera"
-
-#~ msgid "Past"
-#~ msgstr "Prošlost"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definisi Funkcije i Adrese"
-
-#~ msgid "Date Start"
-#~ msgstr "Početni datum"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Redosled vaznosti ovog posla na listi naslova poslova linkovanog partnera"
-
-#~ msgid "Migrate"
-#~ msgstr "Migriraj"
-
-#~ msgid "Status of Address"
-#~ msgstr "Status adresa"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Mozes upisati prvo Adresu, partner ce biti linkovan automatski ako postoji."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Broj posl. Faksa"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Funkcija ovog kontakta sa datim partnerom"
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Datum pocetka posla ( datum prikljucenja)"
-
-#~ msgid "Last date of job"
-#~ msgstr "Poslednji datum posla"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Drugacije ovi detalji nece biti vidljivi iz adresa / kontakta"
-
-#~ msgid "Communication"
-#~ msgstr "Komunikacija"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adresa koja je lonkovana za Partnera"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Zbog promena u Adresama i Partnerovim relacijama, neki detalji iz adresa "
-#~ "treba da se premeste u kontakt informacije."
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Posl.Email"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Br.Posl. Telefon"
-
-#~ msgid "Search Contact"
-#~ msgstr "Pretrazi Kontakt"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "Address Migration"
-#~ msgstr "Adresa pomeranja"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Otvoreni Poslovi"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Da li zelis da pomeris svoje Podatke Adresa u podatke kontakta"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Ako ovo selektujes"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Napredak Konfiguracije"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "Redosled vaznosti ovih adresa u listi adresa linkovanog kontakta"
diff --git a/addons/base_contact/i18n/sr@latin.po b/addons/base_contact/i18n/sr@latin.po
deleted file mode 100644
index d113b9f5b66..00000000000
--- a/addons/base_contact/i18n/sr@latin.po
+++ /dev/null
@@ -1,469 +0,0 @@
-# Serbian latin translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-20 15:52+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\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:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "Grad"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr "Ime/prezime"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakti"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr "Profesionlne informacije"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Ime"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr "Mesto"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Partner na adresu"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Ako je aktivno polje podešeno na ''Lažno'' (false), omogućiće Vam da "
-"sakrijete partnera a da ga ne izbrišete."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Internet stranica"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "Poštanski broj"
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr "Federalna država"
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "Preduzeće"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Naslov"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr "Glavni partner"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Osnovni kontakt"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E‑pošta:"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktivan"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Nacionalnost"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Postanska adresa"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Glavna funkcija"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definiši partnere i njihove adrese"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Jezik"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobilni"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "Država"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Napomene"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Ljudi s kojima radite."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Dodatne informacije"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funkcije i adrese"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr "res.partner.location"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Preduzeća s kojima radite."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Glavni poslodavac"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Kontakt partnera"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adrese"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Adrese na radu i privatne adrese."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Prezime"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Fotografija"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr "Mesta"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Opšte"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "Ulica"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Partneri"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partnerove adrese"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr "Ulica2"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "Lični podaci"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Datum rođenja"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešno ime modela u definiciji akcije."
-
-#~ msgid "# of Contacts"
-#~ msgstr "# Kontakata"
-
-#~ msgid "Fax"
-#~ msgstr "Faks"
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Datum pocetka posla ( datum prikljucenja)"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Funkcija ovog kontakta sa datim partnerom"
-
-#~ msgid "Status of Address"
-#~ msgstr "Status adresa"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Mozes upisati prvo Adresu, partner ce biti linkovan automatski ako postoji."
-
-#~ msgid "Job FAX no."
-#~ msgstr "Broj posl. Faksa"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Definisi Funkcije i Adrese"
-
-#~ msgid "Last date of job"
-#~ msgstr "Poslednji datum posla"
-
-#~ msgid "Migrate"
-#~ msgstr "Migriraj"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Poslovi na istoj Adresi Partnera"
-
-#~ msgid "Partner Function"
-#~ msgstr "Funkcija Partnera"
-
-#~ msgid "State"
-#~ msgstr "Stanje"
-
-#~ msgid "Date Stop"
-#~ msgstr "Datum Završetka"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Poslovi kontakta"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorije"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr ""
-#~ "Redosled vaznosti ovog posla na listi naslova poslova linkovanog partnera"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Extension"
-#~ msgstr "Dodatak"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Interna/Externa Ekstenzija Tel. broja"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Br.Posl. Telefon"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Posl.Email"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Partner Seq."
-
-#~ msgid "Function to address"
-#~ msgstr "Funkcija na Adresu"
-
-#~ msgid "Communication"
-#~ msgstr "Komunikacija"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "Past"
-#~ msgstr "Prošlost"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Seq. Osobe"
-
-#~ msgid "Search Contact"
-#~ msgstr "Pretrazi Kontakt"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Zbog promena u Adresama i Partnerovim relacijama, neki detalji iz adresa "
-#~ "treba da se premeste u kontakt informacije."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adresa koja je lonkovana za Partnera"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Dodatno polje za Tel"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Drugacije ovi detalji nece biti vidljivi iz adresa / kontakta"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Napredak Konfiguracije"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "Contact Functions"
-#~ msgstr "Funkcije Osoba"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Da li zelis da pomeris svoje Podatke Adresa u podatke kontakta"
-
-#~ msgid "Seq."
-#~ msgstr "Sekv."
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Ako ovo selektujes"
-
-#~ msgid "Current"
-#~ msgstr "Trenutni"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Funkcija Kontakta Partnera"
-
-#~ msgid "Other"
-#~ msgstr "Drugo"
-
-#~ msgid "Function"
-#~ msgstr "Funkcija"
-
-#~ msgid "Main Job"
-#~ msgstr "Glavni Posao"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Određuje Osobe i Funkcije"
-
-#~ msgid "Contact to function"
-#~ msgstr "Kontakt na funkciju"
-
-#~ msgid "Address"
-#~ msgstr "Adresa"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Otvoreni Poslovi"
-
-#~ msgid "Address Migration"
-#~ msgstr "Adresa pomeranja"
-
-#~ msgid "Date Start"
-#~ msgstr "Početni datum"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "Redosled vaznosti ovih adresa u listi adresa linkovanog kontakta"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "es.partner.contact"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "redosled važnosti ovog naziva Posla-Radnog mesta u listi naziva Poslova-"
-#~ "Radnih mesta povezanog Partnera"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "redosled važnosti ove Adrese u listi Adresa povezanog Partnera"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Postupak Osnovnog Kontakta"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Kontakti partnera"
-
-#~ msgid "General Information"
-#~ msgstr "Opšte informacije"
diff --git a/addons/base_contact/i18n/sv.po b/addons/base_contact/i18n/sv.po
deleted file mode 100644
index d2c31db2c9c..00000000000
--- a/addons/base_contact/i18n/sv.po
+++ /dev/null
@@ -1,438 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.14\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-12 09:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Kontakter"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Förnamn"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Företag till adress"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Kontakten kab gömmas utan att du behöver ta bort den om du markeras denna."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Webbplats"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Titel"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Huvudkontakt"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-post"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Aktiv"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Medborgarskap"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Postadress"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Huvudfunktion"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Definiera företag och deras adress."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Namn"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Språk"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Mobil"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Anteckningar"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Personer du arbetar med."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Extra information"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Funktion och adress"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Företag du arbetar med."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Huvudarbetsgivare"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Företagskontakt"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adresser"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Arbets- och privatadresser."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Efternamn"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Bild"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Allmänt"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Företag"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Företag"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Företagsadress"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Födelsedatum"
-
-#~ msgid "Current"
-#~ msgstr "Aktuell"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Function"
-#~ msgstr "Funktion"
-
-#~ msgid "Date Stop"
-#~ msgstr "Slutdatum"
-
-#~ msgid "Categories"
-#~ msgstr "Kategorier"
-
-#~ msgid "Address"
-#~ msgstr "Adress"
-
-#~ msgid "General Information"
-#~ msgstr "Allmän information"
-
-#~ msgid "State"
-#~ msgstr "Delstat/Region/Län"
-
-#~ msgid "Date Start"
-#~ msgstr "Startdatum"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Contact to function"
-#~ msgstr "Kontakt till funktion"
-
-#~ msgid "Other"
-#~ msgstr "Övrigt"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Extension"
-#~ msgstr "Filändelse"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Skapa funktion och adress."
-
-#~ msgid "Contact Functions"
-#~ msgstr "Kontaktfunktion"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Skapa kontakter och funktioner."
-
-#~ msgid "Additional phone field"
-#~ msgstr "Extra telefonfält"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Kontakts  arbete"
-
-#~ msgid "Main Job"
-#~ msgstr "Huvud arbete"
-
-#~ msgid "Function to address"
-#~ msgstr "Funktion till adress"
-
-#~ msgid "Past"
-#~ msgstr "Tidigare"
-
-#~ msgid "Seq."
-#~ msgstr "Sek."
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Process för grundkontakt"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Intern/Extern telefonanknytning"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Kontakt Sek."
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr "Arbetstitelordning"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "Adressordning"
-
-#~ msgid "Partner Function"
-#~ msgstr "Företagsfunktion"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Företagsserienummer"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Kontakt företag funktion"
-
-#~ msgid "# of Contacts"
-#~ msgstr "Antal kontakter"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Företagskontakt"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Arbeten på samma företagsadress."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Invalid model name in the action definition."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalid XML for View Architecture!"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Annars kommer dessa uppgifter inte synas från adress/kontakt"
-
-#~ msgid "Search Contact"
-#~ msgstr "Sök kontakt"
-
-#~ msgid "Status of Address"
-#~ msgstr "Adressstatus"
-
-#~ msgid "Job Phone no."
-#~ msgstr "Arbetstelefonnr."
-
-#~ msgid "Last date of job"
-#~ msgstr "Senaste arbetsdatum"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "Arbetsepost"
-
-#~ msgid "Migrate"
-#~ msgstr "Flytta"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Adressen som är kopplad till företaget"
-
-#~ msgid "Image"
-#~ msgstr "Bild"
-
-#~ msgid "Communication"
-#~ msgstr "Kommunikation"
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "Anställningens startdatum"
-
-#~ msgid "Address Migration"
-#~ msgstr "Adressmigrering"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Du kan registrera adressen först, företaget kopplas automatiskt om det finns."
-
-#~ msgid "Open Jobs"
-#~ msgstr "Öppna arbeten"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Vill du flytta din adress i kontaktinformationen"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Om du väljer denna så kommer alla adresser flyttas"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfigurationsförlopp"
diff --git a/addons/base_contact/i18n/th.po b/addons/base_contact/i18n/th.po
deleted file mode 100644
index 1330797a936..00000000000
--- a/addons/base_contact/i18n/th.po
+++ /dev/null
@@ -1,318 +0,0 @@
-# Thai translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-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: 2011-01-15 09:34+0000\n"
-"Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
-"Language-Team: Thai <th@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:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "ผู้ติดต่อ"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "ชื่อ"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "เว็บไซต์"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "คำนำหน้าชื่อ"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "อีเมล์"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "เปิดใช้งาน"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "สัญชาติ"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "ที่อยู่ทางไปรษณีย์"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "ฟังก์ชั่นหลัก"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "ชื่อ"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "ภาษา"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "โทรศัพท์มือถือ"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "บันทึก"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "บุคคลที่คุณทำงานด้วย"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "ข้อมูลเพิ่มเติม"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "หน้าที่และที่อยู่"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "ชื่อผู้ติดต่อ"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "ที่อยู่"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "นามสกุล"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "รูปภาพ"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "ทั่วไป"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "ที่อยู่พาร์ตเนอร์"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "วันเกิด"
-
-#~ msgid "title"
-#~ msgstr "คำนำหน้าชื่อ"
-
-#~ msgid "Fax"
-#~ msgstr "โทรสาร"
-
-#~ msgid "Migrate"
-#~ msgstr "ย้าย"
-
-#~ msgid "State"
-#~ msgstr "สถานะ"
-
-#~ msgid "Categories"
-#~ msgstr "ประเภท"
-
-#~ msgid "Date Stop"
-#~ msgstr "วันสิ้นสุด"
-
-#~ msgid "Extension"
-#~ msgstr "ส่วนขยาย"
-
-#~ msgid "Communication"
-#~ msgstr "การติดต่อสื่อสาร"
-
-#~ msgid "Image"
-#~ msgstr "รูปภาพ"
-
-#~ msgid "Search Contact"
-#~ msgstr "ค้นหาผู้ติดต่อ"
-
-#~ msgid "Phone"
-#~ msgstr "โทรศัพท์"
-
-#~ msgid "Configure"
-#~ msgstr "ตั้งค่า"
-
-#~ msgid "Other"
-#~ msgstr "อื่นๆ"
-
-#~ msgid "Function"
-#~ msgstr "ฟังก์ชั่น"
-
-#~ msgid "Address"
-#~ msgstr "ที่อยู่"
-
-#~ msgid "Date Start"
-#~ msgstr "วันเริ่มต้น"
-
-#~ msgid "Define functions and address."
-#~ msgstr "ระบุหน้าที่และที่อยู่"
-
-#~ msgid "Current"
-#~ msgstr "ปัจจุบัน"
diff --git a/addons/base_contact/i18n/tlh.po b/addons/base_contact/i18n/tlh.po
deleted file mode 100644
index c7ff0c02928..00000000000
--- a/addons/base_contact/i18n/tlh.po
+++ /dev/null
@@ -1,263 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
deleted file mode 100644
index b3a69a3b419..00000000000
--- a/addons/base_contact/i18n/tr.po
+++ /dev/null
@@ -1,490 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-23 21:56+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "Şehir"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr "Ad/Soyad"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "İlgililer"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr "Profesyonel Bilgiler"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Ad"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr "Yer"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Adreslenecek Paydaş"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-"Eğer aktif alan hayır olarak ayarlanmışsa, paydaşın adresini silmeden "
-"gizleyebilirsiniz."
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Web Sitesi"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "Posta Kodu"
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr "Fed. Eyalet"
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "Şirket"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Unvan"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr "Ana Cari"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Temel İlgili"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "E-posta"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Etkin"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Uyruk"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "Posta Adresi"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Ana Görev"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Paydaşları ve adreslerini tanımla"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "Ad"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Dil"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Gsm No"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "Ülke"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Notlar"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Birlikte Çalıştığınız Kişiler"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Ek Bilgi"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Görevler ve Adresleri"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "İlgili"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr "res.partner.location"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Birlikte çalıştığınız firmalar"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Ana İşveren"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Paydaş İlgilisi"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Adresler"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "İş ve Özel Adresler"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Soyadı"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "Foto"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr "Lokasyonlar"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Genel"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "Sokak"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Paydaş"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Paydaşlar"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Paydaş Adresleri"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr "Sokak2"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "Kişisel Bilgiler"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Doğum Tarihi"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid "Other"
-#~ msgstr "Diğer"
-
-#~ msgid "# of Contacts"
-#~ msgstr "İlgili Sayısı"
-
-#~ msgid "Date Stop"
-#~ msgstr "Durma Tarihi"
-
-#~ msgid "Address"
-#~ msgstr "Adres"
-
-#~ msgid "Categories"
-#~ msgstr "Kategoriler"
-
-#~ msgid "Seq."
-#~ msgstr "Sıra"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Cari İletişimleri"
-
-#~ msgid "State"
-#~ msgstr "Durum"
-
-#~ msgid "Past"
-#~ msgstr "Geçmiş"
-
-#~ msgid "General Information"
-#~ msgstr "Genel Bilgiler"
-
-#~ msgid "Fax"
-#~ msgstr "Faks"
-
-#~ msgid "Status of Address"
-#~ msgstr "Adres Durumu"
-
-#~ msgid "Job Phone no."
-#~ msgstr "İş Telefon No"
-
-#~ msgid "Migrate"
-#~ msgstr "Taşı"
-
-#~ msgid "Image"
-#~ msgstr "Resim"
-
-#~ msgid "Communication"
-#~ msgstr "İletişim"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Yapılandırma Aşaması"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Diğer Telefon no"
-
-#~ msgid "Configure"
-#~ msgstr "Yapılandır"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "Bunu seçerseniz, bütün adresler taşınacak"
-
-#~ msgid "Job FAX no."
-#~ msgstr "İş Faks No"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "Yoksa bu detaylar adres/kişiler bölümünde görülebilir olmayacak"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "Adreslerin Kişilere taşınması"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "Adres bilgilerini Kişi bilgilerine taşımak ister misiniz?"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "Bu adresin, ilgili kişinin adres listesindeki sıralamasının önemi"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "Adreslerin taşınması için ilgili seçeneği seçiniz"
-
-#~ msgid "Last date of job"
-#~ msgstr "İşin son tarihi"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr ""
-#~ "Önce adresi girin, eğer varsaPaydaş otomatik olarak ilişkilendirilecek"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "Bu kişininbu paydaşdaki görevi"
-
-#~ msgid "title"
-#~ msgstr "unvan"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "İşin Başlangıç Tarihi (katılım Tarihi)"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Görev ve Adres Tanımları"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Aynı paydaş adresindeki görevler"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "İlgilinin işleri"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr "Bu görevin sırasının ilgili paydaşın görev listesindeki önemi"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        ........Bu bölüm listenizdeki tüm kişileri yönetmenize imkan sağlar\n"
-#~ "\n"
-#~ "    Tanımlamanıza izin verir\n"
-#~ "        *Paydaş ile ilgili olmayan kişiler,\n"
-#~ "        *birkaç farklı adreste çalışan kişiler (farklı iş ortakları için)\n"
-#~ "        *her iş adresinde farklı işlev gösteren kişiler\n"
-#~ "    "
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "İçhat/Dışhat telefon no"
-
-#~ msgid "Extension"
-#~ msgstr "İçhat"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "İş Eposta"
-
-#~ msgid "Function to address"
-#~ msgstr "Adrese görev"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Paydaş Sıra No."
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "Paydaşı ile ilişkili olan adresler"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr ""
-#~ "Adres vePaydaş ile ilgili değişiklikler nedeniyle adres ile ilgili bazı "
-#~ "detaylar kişi bilgisine taşınmalı"
-
-#~ msgid "Partner Function"
-#~ msgstr "Paydaşın Görevi"
-
-#~ msgid "Search Contact"
-#~ msgstr "İlgili Ara"
-
-#~ msgid "Contact Seq."
-#~ msgstr "İlgili Sırası"
-
-#~ msgid "Contact Functions"
-#~ msgstr "İlgili Görevi"
-
-#~ msgid "Main Job"
-#~ msgstr "Ana İş"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "İlgilileri ve görevleri tanımlar"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Paydaş İlgilisi Görevi"
-
-#~ msgid "Contact to function"
-#~ msgstr "İlgili Görevi"
-
-#~ msgid "Current"
-#~ msgstr "Geçerli"
-
-#~ msgid "Function"
-#~ msgstr "Görev"
-
-#~ msgid "Address Migration"
-#~ msgstr "Adres Taşıma"
-
-#~ msgid "Date Start"
-#~ msgstr "Başlangıç Tarihi"
-
-#~ msgid "Open Jobs"
-#~ msgstr "Açık İşler"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "Paydaşın güncel adreslerini ilgililere taşı"
diff --git a/addons/base_contact/i18n/uk.po b/addons/base_contact/i18n/uk.po
deleted file mode 100644
index ae134462ab8..00000000000
--- a/addons/base_contact/i18n/uk.po
+++ /dev/null
@@ -1,274 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-08 13:55+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Контакти"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#~ msgid "Categories"
-#~ msgstr "Категорії"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильний XML для Архітектури Вигляду!"
diff --git a/addons/base_contact/i18n/vi.po b/addons/base_contact/i18n/vi.po
deleted file mode 100644
index c56ac0397ee..00000000000
--- a/addons/base_contact/i18n/vi.po
+++ /dev/null
@@ -1,392 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-28 09:09+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "Liên hệ"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "Tên"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Đối tác đến địa chỉ"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Địa chỉ web"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Tước vị"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "Liên hệ cơ bản"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "Thư điện tử"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Hoạt động"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Quốc tịch"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "Chức năng chính"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Xác định đối tác và địa chỉ đối tác."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Ngôn ngữ"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Số di động"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "Các ghi chú"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Những người bạn cùng làm việc."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Thông tin bổ sung"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Chức năng và địa chỉ"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "Liên hệ"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Công ty bạn đang làm việc."
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "Nhà tuyển dụng chính"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Thông tin liên hệ đối tác"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "Địa chỉ"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Địa chỉ làm việc và địa chỉ riêng."
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "Họ"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "Thông tin chung"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "Đối tác"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Đối tác"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Địa chỉ của đối tác"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Ngày sinh"
-
-#~ msgid "Contact Seq."
-#~ msgstr "Thứ tự liên hệ"
-
-#~ msgid "res.partner.contact"
-#~ msgstr "res.partner.contact"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Tên đối tượng phải bắt đầu với x_ và không chứa bất kỳ ký tự đặc biệt nào!"
-
-#~ msgid "Partner Function"
-#~ msgstr "Chức năng đối tác"
-
-#~ msgid "Partner Seq."
-#~ msgstr "Thứ tự đối tác"
-
-#~ msgid "Current"
-#~ msgstr "Hiện hành"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "Chức năng liên hệ đối tác"
-
-#~ msgid "Other"
-#~ msgstr "Khác"
-
-#~ msgid "Contact to function"
-#~ msgstr "Liên hệ đến chức năng"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Tên mô hình không hợp lệ trong định nghĩa hành động."
-
-#~ msgid "# of Contacts"
-#~ msgstr "Số liên hệ"
-
-#~ msgid "Additional phone field"
-#~ msgstr "Điện thoại bổ sung"
-
-#~ msgid "Function"
-#~ msgstr "Chức năng"
-
-#~ msgid "Fax"
-#~ msgstr "Fax"
-
-#~ msgid "Phone"
-#~ msgstr "Điện thoại"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "Xác định địa chỉ liên hệ và chức năng."
-
-#~ msgid "Contact Functions"
-#~ msgstr "Chức năng liên hệ"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr ""
-#~ "Thứ tự quan trọng của công việc này trong danh sách các công việc của đối tác"
-
-#~ msgid "Date Stop"
-#~ msgstr "Ngày kết thúc"
-
-#~ msgid "Address"
-#~ msgstr "Địa chỉ"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "Công việc"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr ""
-#~ "Thứ tự quan trọng của địa chỉ này trong danh sách các địa chỉ của đối tác"
-
-#~ msgid "Main Job"
-#~ msgstr "Công việc chính"
-
-#~ msgid "Categories"
-#~ msgstr "Loại"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML không hợp lệ để xem kiến trúc!"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "Quy trình liên hệ cơ bản"
-
-#~ msgid "Seq."
-#~ msgstr "Thứ tự"
-
-#~ msgid "Extension"
-#~ msgstr "Số máy nhánh"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "Số điện thoại máy nhánh nội bộ/bên ngoài"
-
-#~ msgid "Function to address"
-#~ msgstr "Chức năng để giải quyết"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "Thông tin liên hệ đối tác"
-
-#~ msgid "State"
-#~ msgstr "Tỉnh/TP"
-
-#~ msgid "Past"
-#~ msgstr "Quá khứ"
-
-#~ msgid "General Information"
-#~ msgstr "Thông tin chung"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "Công việc tại cùng địa chỉ của đối tác."
-
-#~ msgid "Date Start"
-#~ msgstr "Ngày bắt đầu"
-
-#~ msgid "Define functions and address."
-#~ msgstr "Xác định chức năng và địa chỉ."
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid "title"
-#~ msgstr "tước vị"
-
-#~ msgid "Configure"
-#~ msgstr "Cấu hình"
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
deleted file mode 100644
index e7fb6591be0..00000000000
--- a/addons/base_contact/i18n/zh_CN.po
+++ /dev/null
@@ -1,504 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-10 03:04+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:07+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr "城市"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr "姓名"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "联系"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr "专业"
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "名字"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr "地点"
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "业务伙伴到地址"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr "如果有效性字段是假值，它可以允许你隐藏业务伙伴联系人不用删除它"
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "网站"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr "邮政编码"
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr "省/州"
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr "公司"
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "称谓"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr "主业务伙伴"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "基本联系人管理模块"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "电子邮件"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "有效"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "国籍"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "邮政地址"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "主要职能"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "定义业务伙伴和地址"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "名称"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "语言"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "手机"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr "国家"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "备注"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "与你工作的人"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "额外信息"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "职能与地址"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "联系人"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr "res.partner.location"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "您工作的公司。"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "主要雇主"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "业务伙伴联系人"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "地址"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "工作和私人地址"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "姓"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "相片"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr "库位"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "一般"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr "街区地址"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "业务伙伴"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "业务伙伴列表"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "业务伙伴地址列表"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr "街区地址2"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr "个人信息"
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "生日"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "联系人业务伙伴职能"
-
-#~ msgid "Partner Function"
-#~ msgstr "业务伙伴职能"
-
-#~ msgid "Current"
-#~ msgstr "当前"
-
-#~ msgid "Main Job"
-#~ msgstr "主业"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "定义联系人和职能"
-
-#~ msgid "Contact Functions"
-#~ msgstr "联系人职能"
-
-#~ msgid "Phone"
-#~ msgstr "电话"
-
-#~ msgid "Function"
-#~ msgstr "职能"
-
-#~ msgid "Base Contact Process"
-#~ msgstr "基本联系人流程"
-
-#~ msgid "Partner Contacts"
-#~ msgstr "业务伙伴联系人"
-
-#~ msgid "State"
-#~ msgstr "省/ 州"
-
-#~ msgid "Past"
-#~ msgstr "过去"
-
-#~ msgid "Define functions and address."
-#~ msgstr "定义职能与地址。"
-
-#~ msgid "Contact to function"
-#~ msgstr "联系人到职能"
-
-#~ msgid "Function to address"
-#~ msgstr "职能到地址"
-
-#~ msgid "Contact Seq."
-#~ msgstr "联系人序号"
-
-#~ msgid "Categories"
-#~ msgstr "分类"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "内部或外部扩充电话号码"
-
-#~ msgid "Other"
-#~ msgstr "其它"
-
-#~ msgid "Fax"
-#~ msgstr "传真"
-
-#~ msgid "Additional phone field"
-#~ msgstr "附加电话字段"
-
-#~ msgid "Partner Seq."
-#~ msgstr "业务伙伴序号"
-
-#~ msgid "Jobs at a same partner address."
-#~ msgstr "相同工作的业务伙伴地址"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须以x_开头并且不能包含特殊字符"
-
-#~ msgid "# of Contacts"
-#~ msgstr "# 联系人"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "在动作定义中使用了无效的模快名。"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "联系人职务"
-
-#~ msgid ""
-#~ "Order of importance of this job title in the list of job title of the linked "
-#~ "partner"
-#~ msgstr "链接业务伙伴按职称按重要性排序的列表"
-
-#~ msgid ""
-#~ "Order of importance of this address in the list of addresses of the linked "
-#~ "contact"
-#~ msgstr "链接联系人按地址重要性排序的地址列表"
-
-#~ msgid "Date Stop"
-#~ msgstr "停止日期"
-
-#~ msgid "Address"
-#~ msgstr "地址"
-
-#~ msgid "Extension"
-#~ msgstr "扩展"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效的视图结构xml文件!"
-
-#~ msgid "General Information"
-#~ msgstr "一般信息"
-
-#~ msgid "Date Start"
-#~ msgstr "开始日期"
-
-#~ msgid "Migrate"
-#~ msgstr "迁移"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr "您应该先输入地址，业务伙伴信息如果存在的话会自动链接过来。"
-
-#~ msgid "Job FAX no."
-#~ msgstr "工作传真号码"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "该业务伙伴联系人的职能"
-
-#~ msgid "Status of Address"
-#~ msgstr "地址状态"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "开始工作的日期（入职日期）"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "选择地址迁移的选项"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "工作电子邮件"
-
-#~ msgid "Job Phone no."
-#~ msgstr "工作电话号码"
-
-#~ msgid "Search Contact"
-#~ msgstr "搜索联系人"
-
-#~ msgid "Image"
-#~ msgstr "图像"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "链接到该业务伙伴的地址"
-
-#~ msgid "Open Jobs"
-#~ msgstr "开放的职位"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "您是否想要把地址数据迁移到联系人数据中？"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "否则这些细节在地址/联系人处不可见"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "base.contact.installer"
-
-#~ msgid ""
-#~ "Order of importance                 of this job title in the list of job "
-#~ "title of the linked partner"
-#~ msgstr "在业务伙伴职位列表里按照职位重要性排列"
-
-#~ msgid "Communication"
-#~ msgstr "沟通"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        这个模块允许您完整地管理您的联系人。\n"
-#~ "\n"
-#~ "    它可以让你定义\n"
-#~ "        *联系人不关联合作伙伴，\n"
-#~ "        *联系人工作在几个地址（这些地址可能是几个业务伙伴）\n"
-#~ "        *联系人几个地址可能是不同职务\n"
-#~ "\n"
-#~ "    它还增加了新的菜单位于\n"
-#~ "        合作伙伴\\联系人\n"
-#~ "        合作伙伴\\职位\n"
-#~ "\n"
-#~ "    注意，此模块转换成“地址+联系人”的现有地址。这意味着一些地址字段将会丢失（如联系人的姓名），因为这些都应该是在其他对象中定义的。\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr "由于地址和合作伙伴的关系的变化，一些细节需要迁移到联系信息。"
-
-#~ msgid "title"
-#~ msgstr "职位"
-
-#~ msgid "Last date of job"
-#~ msgstr "工作的最后日期"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "地址的迁移到通讯录"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "按照重要性列表这些联系人的地址"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "如果你选择这个,所有地址将被迁移。"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "你可以迁移业务伙伴的当前地址到联系人上"
-
-#~ msgid "Address Migration"
-#~ msgstr "地址迁移"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "设置进度"
-
-#~ msgid "Configure"
-#~ msgstr "设置"
-
-#~ msgid "Seq."
-#~ msgstr "序列"
diff --git a/addons/base_contact/i18n/zh_TW.po b/addons/base_contact/i18n/zh_TW.po
deleted file mode 100644
index 755e04ff3ef..00000000000
--- a/addons/base_contact/i18n/zh_TW.po
+++ /dev/null
@@ -1,461 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-26 05:23+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: base_contact
-#: field:res.partner.location,city:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "First/Lastname"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: field:res.partner.location,job_ids:0
-msgid "Contacts"
-msgstr "聯絡人"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Professional Info"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,first_name:0
-msgid "First Name"
-msgstr "名"
-
-#. module: base_contact
-#: field:res.partner.address,location_id:0
-msgid "Location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "伙伴至地址"
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid ""
-"If the active field is set to False,                 it will allow you to "
-"hide the partner contact without removing it."
-msgstr "如「活躍」欄設為「否」，伙伴聯絡資料會隱藏而非移除。"
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "網站"
-
-#. module: base_contact
-#: field:res.partner.location,zip:0
-msgid "Zip"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.location,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "稱謂"
-
-#. module: base_contact
-#: field:res.partner.location,partner_id:0
-msgid "Main Partner"
-msgstr ""
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr "基礎聯絡人"
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-msgid "E-Mail"
-msgstr "電子郵件"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "活躍"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "國籍"
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Postal Address"
-msgstr "郵遞地址"
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr "主要功能"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "定義伙伴及其地址。"
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Name"
-msgstr "名稱"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "語言"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "手機"
-
-#. module: base_contact
-#: field:res.partner.location,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr "備註"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "額外資訊"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "功能及地址"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.address,contact_id:0
-msgid "Contact"
-msgstr "聯絡人"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_location
-msgid "res.partner.location"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "您工作之公司。"
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr "主要僱主"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "伙伴聯絡人"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_addresses0
-msgid "Addresses"
-msgstr "地址"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "辦公及私人地址"
-
-#. module: base_contact
-#: field:res.partner.contact,last_name:0
-msgid "Last Name"
-msgstr "姓"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,photo:0
-msgid "Photo"
-msgstr "相片"
-
-#. module: base_contact
-#: view:res.partner.location:0
-msgid "Locations"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr "一般"
-
-#. module: base_contact
-#: field:res.partner.location,street:0
-msgid "Street"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner"
-msgstr "伙伴"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "伙伴"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "伙伴地址"
-
-#. module: base_contact
-#: field:res.partner.location,street2:0
-msgid "Street2"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "出生日期"
-
-#~ msgid "# of Contacts"
-#~ msgstr "聯絡人數目"
-
-#~ msgid ""
-#~ "You may                     enter Address first,Partner will be linked "
-#~ "automatically if any."
-#~ msgstr "可先輸入地址，如有伙伴會自動連結。"
-
-#~ msgid "Job FAX no."
-#~ msgstr "工作傳真號碼"
-
-#~ msgid "Function of this contact with this partner"
-#~ msgstr "此聯絡人於此伙伴之功能"
-
-#~ msgid "Status of Address"
-#~ msgstr "地址狀態"
-
-#~ msgid "title"
-#~ msgstr "稱謂"
-
-#~ msgid "Start date of job(Joining Date)"
-#~ msgstr "開始工作日期（加入日期）"
-
-#~ msgid "Fax"
-#~ msgstr "傳真"
-
-#~ msgid "Define functions and address."
-#~ msgstr "定義功能及地址"
-
-#~ msgid "Last date of job"
-#~ msgstr "最後工作日期"
-
-#~ msgid "Categories"
-#~ msgstr "分類"
-
-#~ msgid "Job Phone no."
-#~ msgstr "工作電話"
-
-#~ msgid "Internal/External extension phone number"
-#~ msgstr "內部或外部分機號碼"
-
-#~ msgid "Contact's Jobs"
-#~ msgstr "聯絡人之工作"
-
-#~ msgid "Extension"
-#~ msgstr "分機"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "設置進度"
-
-#~ msgid "Job E-Mail"
-#~ msgstr "工作電郵"
-
-#~ msgid "Image"
-#~ msgstr "圖片"
-
-#~ msgid "Communication"
-#~ msgstr "通訊"
-
-#~ msgid "Past"
-#~ msgstr "過去"
-
-#~ msgid "Partner Seq."
-#~ msgstr "伙伴序號"
-
-#~ msgid "Search Contact"
-#~ msgstr "搜尋聯絡人"
-
-#~ msgid "Additional phone field"
-#~ msgstr "額外電話欄"
-
-#~ msgid "Address's Migration to Contacts"
-#~ msgstr "遷移地址至聯絡人"
-
-#~ msgid "Contact Seq."
-#~ msgstr "聯絡人序號"
-
-#~ msgid "Address Migration"
-#~ msgstr "遷移地址"
-
-#~ msgid "Migrate"
-#~ msgstr "遷移"
-
-#~ msgid "Do you want to migrate your Address data in Contact Data?"
-#~ msgstr "是否遷移聯絡人資料中之地址資料？"
-
-#~ msgid "If you select this, all addresses will be migrated."
-#~ msgstr "如選取，將遷移所有地址。"
-
-#~ msgid "Select the Option for Addresses Migration"
-#~ msgstr "選取地址遷移選項"
-
-#~ msgid "You can migrate Partner's current addresses to the contact."
-#~ msgstr "可將伙伴目前地址遷移至聯絡人"
-
-#~ msgid "Address which is linked to the Partner"
-#~ msgstr "連結至伙伴之地址"
-
-#~ msgid ""
-#~ "Due to changes in Address and Partner's relation, some of the details from "
-#~ "address are needed to be migrated into contact information."
-#~ msgstr "由於地址與伙伴關係有變，某些地址詳情要遷移至聯絡人資訊。"
-
-#~ msgid "Contact Partner Function"
-#~ msgstr "聯絡人伙伴功能"
-
-#~ msgid "Partner Function"
-#~ msgstr "伙伴功能"
-
-#~ msgid "Contact Functions"
-#~ msgstr "聯絡人功能"
-
-#~ msgid ""
-#~ "\n"
-#~ "        This module allows you to manage your contacts entirely.\n"
-#~ "\n"
-#~ "    It lets you define\n"
-#~ "        *contacts unrelated to a partner,\n"
-#~ "        *contacts working at several addresses (possibly for different "
-#~ "partners),\n"
-#~ "        *contacts with possibly different functions for each of its job's "
-#~ "addresses\n"
-#~ "\n"
-#~ "    It also adds new menu items located in\n"
-#~ "        Partners \\ Contacts\n"
-#~ "        Partners \\ Functions\n"
-#~ "\n"
-#~ "    Pay attention that this module converts the existing addresses into "
-#~ "\"addresses + contacts\". It means that some fields of the addresses will be "
-#~ "missing (like the contact name), since these are supposed to be defined in "
-#~ "an other object.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        本模組讓您完全掌控聯絡人資料\n"
-#~ "\n"
-#~ "    其讓您定義\n"
-#~ "        *與伙伴無關之聯絡人、\n"
-#~ "        *有多個地址之聯絡人（可能有不同伙伴）、\n"
-#~ "        *有不同功能工作地址之聯絡人\n"
-#~ "\n"
-#~ "    選單會添加以下項目\n"
-#~ "        伙伴 \\ 聯絡人\n"
-#~ "        伙伴 \\ 功能\n"
-#~ "\n"
-#~ "    請注意：此模組會將現在地址轉換為「地址 + 聯絡人」格式。意思是地址會缺少某些欄位（如聯絡人名稱），因其應由其他物件定義。\n"
-#~ "    "
-
-#~ msgid "Function to address"
-#~ msgstr "功能至地址"
-
-#~ msgid "Function"
-#~ msgstr "功能"
-
-#~ msgid "Defines contacts and functions."
-#~ msgstr "定義聯絡人及功能"
-
-#~ msgid "Contact to function"
-#~ msgstr "聯絡人至功能"
-
-#~ msgid "Phone"
-#~ msgstr "電話"
-
-#~ msgid "Otherwise these details will not be visible from address/contact."
-#~ msgstr "否則此等詳情將不顯示給地址及聯絡人。"
-
-#~ msgid "base.contact.installer"
-#~ msgstr "基礎.聯絡人.安裝"
-
-#~ msgid "Configure"
-#~ msgstr "配置"
-
-#~ msgid "Seq."
-#~ msgstr "序號"
-
-#~ msgid "Main Job"
-#~ msgstr "主要工作"
-
-#~ msgid "Current"
-#~ msgstr "目前"
-
-#~ msgid "Address"
-#~ msgstr "地址"
-
-#~ msgid "Other"
-#~ msgstr "其他"
-
-#~ msgid ""
-#~ "Order of                     importance of this address in the list of "
-#~ "addresses of the linked contact"
-#~ msgstr "此地址於已連結聯絡人地址之重要性"
-
-#~ msgid "Date Start"
-#~ msgstr "開始日期"
-
-#~ msgid "Open Jobs"
-#~ msgstr "開啟工作"
diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml
deleted file mode 100644
index 54b9ed08cd9..00000000000
--- a/addons/base_contact/process/base_contact_process.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-
-	<!--
-		Process
-	-->
-
-		<record id="process_process_basecontactprocess0" model="process.process">
-			<field eval="&quot;&quot;&quot;Base Contact&quot;&quot;&quot;" name="name"/>
-			<field eval="1" name="active"/>
-			<field name="model_id" ref="base_contact.model_res_partner_contact"/>
-		</record>
-
-	<!--
-		Process node
-	-->
-
-		<record id="process_node_contacts0" model="process.node">
-			<field name="menu_id" ref="base_contact.menu_partner_contact_form"/>
-			<field name="model_id" ref="base_contact.model_res_partner_contact"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;People you work with.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Contacts&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_basecontactprocess0"/>
-			<field eval="1" name="flow_start"/>
-		</record>
-
-		<record id="process_node_partners0" model="process.node">
-			<field name="menu_id" ref="base.menu_partner_form"/>
-			<field name="model_id" ref="base.model_res_partner"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Companies you work with.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Partners&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_basecontactprocess0"/>
-			<field eval="1" name="flow_start"/>
-		</record>
-
-		<record id="process_node_addresses0" model="process.node">
-			<field name="menu_id" ref="base.menu_partner_address_form"/>
-			<field name="model_id" ref="base.model_res_partner_address"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Working and private addresses.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Addresses&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_basecontactprocess0"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-
-	<!--
-		Process Transition
-	-->
-
-		<record id="process_transition_partnertoaddress0" model="process.transition">
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Partner to address&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Define partners and their addresses.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_addresses0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_partners0"/>
-		</record>
-
-	</data>
-</openerp>
diff --git a/addons/base_contact/security/ir.model.access.csv b/addons/base_contact/security/ir.model.access.csv
deleted file mode 100644
index 0a7ffeee7f8..00000000000
--- a/addons/base_contact/security/ir.model.access.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_partner_contact","res.partner.contact","model_res_partner_contact","base.group_partner_manager",1,1,1,1
-"access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact","base.group_user",1,0,0,0
-"access_res_partner_location","res.partner.location","model_res_partner_location","base.group_user",1,0,0,0
-"access_res_partner_location_sale_salesman","res.partner.location","model_res_partner_location","base.group_sale_salesman",1,1,1,0
-"access_res_partner_address_sale_salesman","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
-"access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact","base.group_sale_salesman",1,1,1,0
diff --git a/addons/base_contact/test/base_contact00.yml b/addons/base_contact/test/base_contact00.yml
deleted file mode 100644
index c2ff49199f7..00000000000
--- a/addons/base_contact/test/base_contact00.yml
+++ /dev/null
@@ -1,38 +0,0 @@
--  |
-   I will test base_contact for following cases:
-    *contacts unrelated to a partner,
-    *contacts working at several addresses (possibly for different partners),
-    *contacts with possibly different functions for each of its job's addresses
--  |
-   In order to check contacts first I will create contact unrelated to a partner
-- 
-    !record {model: res.partner.contact, id: res_partner_contact_williams0}:
-        country_id: base.be
-        first_name: Laura
-        last_name: Henrion
-        job_ids:
-            - email: lwilliams@mydomain.com
-              function: PA
-              phone: (+32).10.45.18.77
-        mobile: (+32).10.45.18.77
-        name: Williams
--   |
-    Now in order to assign this contact to partner I will create one partner assign contact laura to this partner
-- 
-    !record {model: res.partner, id: res_partner_laurascompany0}:
-        address:
-            - city: Namur
-              country_id: base.be
-              phone: (+32).10.45.18.77
-              street: 23, street ways
-              type: default
-              zip: '2324324'
-              function: CEO
-              contact_id: res_partner_contact_williams0
-        name: Lauras Company
-        ref: LC
-- 
-    Now I will check that the new job is assigned properly to contact or not
--
-    !assert {model: res.partner.contact, id: res_partner_contact_williams0}:
-        - len(job_ids) == 2
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index c2fd0a25ef8..9b91f7d3108 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -211,9 +211,11 @@ class users(osv.osv):
         encrypted_pw = encrypt_md5(password, salt)
     
         # Check if the encrypted password matches against the one in the db.
-        cr.execute('UPDATE res_users SET date=now() ' \
-                'WHERE id=%s AND password=%s AND active RETURNING id', 
-            (int(id), encrypted_pw.encode('utf-8')))
+        cr.execute("""UPDATE res_users
+                        SET date=now() AT TIME ZONE 'UTC'
+                        WHERE id=%s AND password=%s AND active
+                        RETURNING id""", 
+                   (int(id), encrypted_pw.encode('utf-8')))
         res = cr.fetchone()
         cr.commit()
     
diff --git a/addons/base_crypt/i18n/ja.po b/addons/base_crypt/i18n/ja.po
new file mode 100644
index 00000000000..440919c7545
--- /dev/null
+++ b/addons/base_crypt/i18n/ja.po
@@ -0,0 +1,45 @@
+# 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-01 06:05+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-02 04:37+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同一のログインに２つのユーザを持つことはできません！"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Please specify the password !"
+msgstr "パスワードを指定してください！"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Error"
+msgstr "エラー"
diff --git a/addons/base_crypt/i18n/pl.po b/addons/base_crypt/i18n/pl.po
new file mode 100644
index 00000000000..4e4ff39a279
--- /dev/null
+++ b/addons/base_crypt/i18n/pl.po
@@ -0,0 +1,45 @@
+# Polish 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-03-28 14:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish <pl@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-03-29 04:35+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nie może być dwóch użytkowników o tym samym loginie !"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Please specify the password !"
+msgstr "Proszę podać hasło!"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Error"
+msgstr "Błąd"
diff --git a/addons/base_module_record/wizard/base_module_record_data.py b/addons/base_module_record/wizard/base_module_record_data.py
index d7b6316e74c..cb1e9507495 100644
--- a/addons/base_module_record/wizard/base_module_record_data.py
+++ b/addons/base_module_record/wizard/base_module_record_data.py
@@ -39,7 +39,7 @@ class base_module_data(osv.osv_memory):
 
     def _get_default_objects(self, cr, uid, context=None):
         names = ('ir.ui.view', 'ir.ui.menu', 'ir.model', 'ir.model.fields', 'ir.model.access',
-            'res.partner', 'res.partner.address', 'res.partner.category', 'workflow',
+            'res.partner', 'res.partner.category', 'workflow',
             'workflow.activity', 'workflow.transition', 'ir.actions.server', 'ir.server.object.lines')
         return self.pool.get('ir.model').search(cr, uid, [('model', 'in', names)])
 
diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py
index e822c68c8fe..22383bc37d6 100644
--- a/addons/base_module_record/wizard/base_module_record_objects.py
+++ b/addons/base_module_record/wizard/base_module_record_objects.py
@@ -39,7 +39,7 @@ class base_module_record(osv.osv_memory):
 
     def _get_default_objects(self, cr, uid, context=None):
         names = ('ir.ui.view', 'ir.ui.menu', 'ir.model', 'ir.model.fields', 'ir.model.access',
-            'res.partner', 'res.partner.address', 'res.partner.category', 'workflow',
+            'res.partner', 'res.partner.category', 'workflow',
             'workflow.activity', 'workflow.transition', 'ir.actions.server', 'ir.server.object.lines')
         return self.pool.get('ir.model').search(cr, uid, [('model', 'in', names)])
 
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 2774767af26..d85c9531733 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -66,10 +66,10 @@
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
       <field name="target">new</field>
-      <field name="context">{'menu':True}</field> 
+      <field name="context">{'menu':True}</field>
     </record>
 
-    <menuitem parent="base.reporting_menu" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="70"/>
+    <menuitem parent="base.menu_reporting_config" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="1"/>
 
   </data>
 </openerp>
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 19c053bae14..a3effd98148 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -204,10 +204,27 @@ class specify_partner_terminology(osv.osv_memory):
 
 
 # Preferences wizard for Sales & CRM.
-# It is defined here because it must be inherited independently in modules sale and crm.
+# It is defined here because it is inherited independently in modules sale, crm,
+# plugin_outlook and plugin_thunderbird.
 #
 class sale_config_settings(osv.osv_memory):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
+    _columns = {
+        'module_crm': fields.boolean('CRM'),
+        'module_plugin_thunderbird': fields.boolean('Thunderbird plugin',
+            help="""The plugin allows you archive email and its attachments to the selected
+                OpenERP objects. You can select a partner, a task, a project, an analytical
+                account, or any other object and attach the selected mail as a .eml file in
+                the attachment of a selected record. You can create documents for CRM Lead,
+                HR Applicant and Project Issue from the selected emails.
+                This installs the module plugin_thunderbird."""),
+        'module_plugin_outlook': fields.boolean('Outlook plugin',
+            help="""The Outlook plugin allows you to select an object that you would like to add
+                to your email and its attachments from MS Outlook. You can select a partner, a task,
+                a project, an analytical account, or any other object and archive a selected
+                email into an OpenERP mail message with attachments.
+                This installs the module plugin_outlook."""),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index efc071fec68..7b471ecc068 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,21 +1,6 @@
 <openerp>
   <data>
 
-     <!-- Import or create customers configartion view  -->
-     <record id="action_import_create_installer" model="ir.actions.act_window">
-         <field name="name">Create or Import Customers</field>
-         <field name="type">ir.actions.act_window</field>
-         <field name="res_model">res.partner</field>
-         <field name="view_type">form</field>
-         <field name="view_mode">tree,form</field>
-         <field name="view_id" ref="base.view_partner_tree"/>
-         <field name="help">Create or Import Customers  and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
-     </record>
-     <record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
-         <field name="action_id" ref="action_import_create_installer"/>
-         <field name="category_id" ref="base.category_sales_management_config"/>
-    </record>
-
      <!-- Define default users preferences-->
      <record id="view_user_preferences_config_form" model="ir.ui.view">
           <field name="name">Set default users preferences</field>
@@ -149,9 +134,22 @@
         <field name="arch" type="xml">
             <form string="Configure Sales">
                 <group name="config_sale" colspan="4"/>
-                <group name="config_contracts" colspan="4"/>
-                <group name="config_emails" 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)]}"/>
+
                 <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>
         </field>
     </record>
diff --git a/addons/base_tools/i18n/es_EC.po b/addons/base_tools/i18n/es_EC.po
new file mode 100644
index 00000000000..3e9b289b0dc
--- /dev/null
+++ b/addons/base_tools/i18n/es_EC.po
@@ -0,0 +1,32 @@
+# Spanish (Ecuador) 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-03-24 04:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-25 05:05+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Base común para módulos herramientas"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/ja.po b/addons/base_tools/i18n/ja.po
new file mode 100644
index 00000000000..3f9d289e72c
--- /dev/null
+++ b/addons/base_tools/i18n/ja.po
@@ -0,0 +1,32 @@
+# 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-03-31 18:52+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-01 04:38+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "ツールモジュールの共通基盤"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_vat/i18n/ja.po b/addons/base_vat/i18n/ja.po
new file mode 100644
index 00000000000..aadd1a69597
--- /dev/null
+++ b/addons/base_vat/i18n/ja.po
@@ -0,0 +1,78 @@
+# 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-01 06: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-02 04:37+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:141
+#, python-format
+msgid ""
+"This VAT number does not seem to be valid.\n"
+"Note: the expected format is %s"
+msgstr ""
+"この付加価値税の値は正しくありません。\n"
+"注：形式は %s です。"
+
+#. module: base_vat
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: base_vat
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー！再帰的な関係となる会員を作ることはできません。"
+
+#. module: base_vat
+#: field:res.company,vat_check_vies:0
+msgid "VIES VAT Check"
+msgstr "VIEAの付加価値税をチェック"
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: base_vat
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー！再帰的な関係となる会社を作ることはできません。"
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr "このパートナが付加価値税の対象になるのであれば，このボックスをチェックしてください。それに付加価値税が適用されます。"
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: base_vat
+#: help:res.company,vat_check_vies:0
+msgid ""
+"If checked, Partners VAT numbers will be fully validated against EU's VIES "
+"service rather than via a simple format validation (checksum)."
+msgstr ""
+"これをチェックすると，パートナーの付加価値税番号が，単なるフォーマットの検証（チェックサムう）ではなく，EUのVIEAサービスに対して検証されます。"
+
+#. module: base_vat
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr "付加価値税の記述"
diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index c5a51795425..8cefd04a3b7 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -160,8 +160,8 @@
         <menuitem id="base.menu_administration" icon="terp-administration"  name="Settings" sequence="50" action="open_board_administration_form"/>
 
         <!-- add a menu item in adminitration/reporting/dashboards -->
-        <menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
-        <menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting" sequence="0"/>
+        <menuitem id="base.menu_reporting_board" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
+        <menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting_board" sequence="0"/>
         <menuitem id="base.menu_dashboard_admin" action="open_board_administration_form" parent="base.menu_dashboard" icon="terp-graph"/>
 
 </data>
diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
index 8a0f150d5be..8a75a3ad496 100644
--- a/addons/board/board_data_home.xml
+++ b/addons/board/board_data_home.xml
@@ -61,7 +61,7 @@
     </record>
 
     <!-- set the default homepage of admin -->
-    <record id="base.user_admin" model="res.users">
+    <record id="base.user_root" model="res.users">
         <field name="action_id" ref="board_homepage_action"/>
     </record>
 
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 36d75002476..9a3745df2e2 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -68,7 +68,7 @@
         <field name="search_view_id" ref="view_board_search"/>
     </record>
 
-    <menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="base.reporting_menu" sequence="1"/>
+    <menuitem action="action_view_board_list_form" id="menu_view_board_form" parent="base.menu_reporting_config" sequence="2"/>
 
 </data>
 </openerp>
diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index 624e93466db..f345484b4a9 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -3,7 +3,7 @@
 
         <act_window id="action_claim_from_delivery" name="Claim"
             domain="[]" target="current"
-            context="{'default_partner_address_id': address_id, 'default_partner_id': partner_id}"
+            context="{'default_partner_id': partner_id}"
             view_mode="form" res_model="crm.claim"
             src_model="stock.picking" />
 
diff --git a/addons/claim_from_delivery/i18n/ja.po b/addons/claim_from_delivery/i18n/ja.po
new file mode 100644
index 00000000000..dcd536c421d
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/ja.po
@@ -0,0 +1,23 @@
+# 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-01 05:47+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-02 04:37+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "クレーム"
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 5f71c404976..447645f615c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -106,7 +106,6 @@ Creates a dashboard for CRM that includes:
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
-        'crm_installer_view.xml',
 
         'res_partner_view.xml',
         'board_crm_statistical_view.xml',
diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index 5ea3844e896..b1b9ec93784 100644
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -107,10 +107,10 @@
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
 
-	    <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
+	    <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
 
         <menuitem
-            name="CRM Dashboard" parent="board.menu_dasboard"
+            name="CRM Dashboard" parent="board.menu_sales_dashboard"
             action="open_board_statistical_dash"
             sequence="0"
             id="menu_board_statistics_dash"
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4ebb0b4796d..6fa84a83560 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -178,7 +178,6 @@ class crm_base(object):
         date_closed
         user_id
         partner_id
-        partner_address_id
     """
     def _get_default_partner_address(self, cr, uid, context=None):
         """Gives id of default address for current user
@@ -238,7 +237,7 @@ class crm_base(object):
         """
         data = {'value': {'email_from': False, 'phone':False}}
         if add:
-            address = self.pool.get('res.partner.address').browse(cr, uid, add)
+            address = self.pool.get('res.partner').browse(cr, uid, add)
             data['value'] = {'email_from': address and address.email or False ,
                              'phone':  address and address.phone or False}
         if 'phone' not in self._columns:
@@ -254,7 +253,6 @@ class crm_base(object):
         data={}
         if  part:
             addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
-            data = {'partner_address_id': addr['contact']}
             data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
         return {'value': data}
 
@@ -488,8 +486,8 @@ class crm_case(crm_base):
             dest = case.user_id.user_email or ""
             body = case.description or ""
             for message in case.message_ids:
-                if message.email_from:
-                    body = message.description
+                if message.email_from and message.body_text:
+                    body = message.body_text
                     break
 
             if not destination:
@@ -516,7 +514,7 @@ class crm_case(crm_base):
                 [dest],
                 subject,
                 body,
-                model='crm.case',
+                model=self._name,
                 reply_to=case.section_id.reply_to,
                 res_id=case.id,
                 attachments=attach_to_send,
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 3947eb58156..ec489ff4d14 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -23,6 +23,7 @@ import re
 import tools
 
 from tools.translate import _
+from tools import ustr
 from osv import fields
 from osv import osv
 
@@ -59,7 +60,7 @@ class base_action_rule(osv.osv):
             reply_to = emailfrom
         if not emailfrom:
             raise osv.except_osv(_('Error!'), _("No E-Mail Found for your Company address!"))
-        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)
+        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
 
     def do_check(self, cr, uid, action, obj, context=None):
         ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)
@@ -73,9 +74,9 @@ class base_action_rule(osv.osv):
         regex = action.regex_history
         if regex:
             res = False
-            ptrn = re.compile(str(regex))
+            ptrn = re.compile(ustr(regex))
             for history in obj.message_ids:
-                _result = ptrn.search(str(history.name))
+                _result = ptrn.search(ustr(history.subject))
                 if _result:
                     res = True
                     break
@@ -90,7 +91,6 @@ class base_action_rule(osv.osv):
         return ok
 
     def do_action(self, cr, uid, action, model_obj, obj, context=None):
-        res = super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
         write = {}
         if hasattr(action, 'act_section_id') and action.act_section_id:
             obj.section_id = action.act_section_id
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
deleted file mode 100644
index 5e871a99659..00000000000
--- a/addons/crm/crm_installer_view.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<openerp>
-  <data>
-    
-    <record model="ir.actions.act_window" id="crm_case_section_view_form_installer">
-        <field name="name">Define Sales Team</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">crm.case.section</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="crm.crm_case_section_view_tree"/>
-        <field name="help">Define sales teams to structure your sales organization and assign users to each team. You should also define the sales stage to each team. As an example, if you use Solutions Selling techniques to track your opportunities, you can assign the following stage to the team: Territory, Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost.</field>
-    </record>
-
-    <record id="crm_case_section_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="crm_case_section_view_form_installer"/>
-        <field name="category_id" ref="base.category_sales_management_config"/>
-        <field name="sequence">10</field>
-        <field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
-    </record>
-
-    <record model="ir.actions.act_window" id="crm_case_stage_form_installer">
-        <field name="name">Review Sales Stages</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">crm.case.stage</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="context">{'default_case_default': 1}</field>
-        <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="help">Stages will allow salesmen to easily track how a specific opportunity is positioned in the sales cycle. In order to efficiently manage your sales pipeline, it's important to define conditions to go to the next step. Example: to set an opportunity as 'Qualified', you must set the "Expected Revenue" and the "Expected Closing Date." You should also have a look at the tooltip of the field "Change Probability Automatically".</field>
-    </record>
-
-    <record id="crm_case_stage_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="crm_case_stage_form_installer"/>
-        <field name="category_id" ref="base.category_sales_management_config"/>
-        <field name="sequence">9</field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b17fa31ac91..2b319e565da 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -40,7 +40,7 @@ class crm_lead(crm_case, osv.osv):
     _name = "crm.lead"
     _description = "Lead/Opportunity"
     _order = "priority,date_action,id desc"
-    _inherit = ['mail.thread','res.partner.address']
+    _inherit = ['mail.thread','res.partner']
 
     def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
         access_rights_uid = access_rights_uid or uid
@@ -60,14 +60,6 @@ class crm_lead(crm_case, osv.osv):
         'stage_id': _read_group_stage_ids
     }
 
-    # overridden because res.partner.address has an inconvenient name_get,
-    # especially if base_contact is installed.
-    def name_get(self, cr, user, ids, context=None):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        return [(r['id'], tools.ustr(r[self._rec_name]))
-                    for r in self.read(cr, user, ids, [self._rec_name], context)]
-
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         """
         @param cr: the current row, from the database cursor,
@@ -147,7 +139,6 @@ class crm_lead(crm_case, osv.osv):
         return res
 
     _columns = {
-        # Overridden from res.partner.address:
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null',
             select=True, help="Optional linked partner, usually after conversion of the lead"),
 
@@ -170,7 +161,7 @@ class crm_lead(crm_case, osv.osv):
             domain="['|',('section_id','=',section_id),('section_id','=',False)]", help="From which campaign (seminar, marketing campaign, mass mailing, ...) did this contact come from?"),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"),
         'contact_name': fields.char('Contact Name', size=64),
-        'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the lead into opportunity', select=1),
+        'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1),
         'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
         'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
         'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
@@ -194,7 +185,6 @@ class crm_lead(crm_case, osv.osv):
 
 
         # Only used for type opportunity
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
         'probability': fields.float('Probability (%)',group_operator="avg"),
         'planned_revenue': fields.float('Expected Revenue'),
         'ref': fields.reference('Reference', selection=crm._links_get, size=128),
@@ -205,8 +195,8 @@ class crm_lead(crm_case, osv.osv):
         'title_action': fields.char('Next Action', size=64),
         'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
         'color': fields.integer('Color Index'),
-        'partner_address_name': fields.related('partner_address_id', 'name', type='char', string='Partner Contact Name', readonly=True),
-        'partner_address_email': fields.related('partner_address_id', 'email', type='char', string='Partner Contact Email', readonly=True),
+        'partner_address_name': fields.related('partner_id', 'name', type='char', string='Partner Contact Name', readonly=True),
+        'partner_address_email': fields.related('partner_id', 'email', type='char', string='Partner Contact Email', readonly=True),
         'company_currency': fields.related('company_id', 'currency_id', 'symbol', type='char', string='Company Currency', readonly=True),
         'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
         'user_login': fields.related('user_id', 'login', type='char', string='User Login', readonly=True),
@@ -225,14 +215,6 @@ class crm_lead(crm_case, osv.osv):
         'color': 0,
     }
 
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        """This function returns value of partner email based on Partner Address
-        """
-        if not add:
-            return {'value': {'email_from': False, 'country_id': False}}
-        address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        return {'value': {'email_from': address.email, 'phone': address.phone, 'country_id': address.country_id.id}}
-
     def on_change_optin(self, cr, uid, ids, optin):
         return {'value':{'optin':optin,'optout':False}}
 
@@ -501,8 +483,7 @@ class crm_lead(crm_case, osv.osv):
             first_opportunity = opportunities_list[0]
             tail_opportunities = opportunities_list[1:]
 
-        fields = ['partner_id', 'title', 'name', 'categ_id', 'channel_id', 'city', 'company_id', 'contact_name', 'country_id',
-            'partner_address_id', 'type_id', 'user_id', 'section_id', 'state_id', 'description', 'email', 'fax', 'mobile',
+        fields = ['partner_id', 'title', 'name', 'categ_id', 'channel_id', 'city', 'company_id', 'contact_name', 'country_id', 'type_id', 'user_id', 'section_id', 'state_id', 'description', 'email', 'fax', 'mobile',
             'partner_name', 'phone', 'probability', 'planned_revenue', 'street', 'street2', 'zip', 'create_date', 'date_action_last',
             'date_action_next', 'email_from', 'email_cc', 'partner_name']
 
@@ -546,7 +527,6 @@ class crm_lead(crm_case, osv.osv):
                 'stage_id': stage_id or False,
                 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'partner_address_id': contact_id,
         }
 
     def _convert_opportunity_notification(self, cr, uid, lead, context=None):
@@ -580,15 +560,42 @@ class crm_lead(crm_case, osv.osv):
                     }, context=context)
         return True
 
-    def _lead_create_partner(self, cr, uid, lead, context=None):
+    def _lead_create_contact(self, cr, uid, lead, name, is_company, parent_id=False, context=None):
         partner = self.pool.get('res.partner')
-        partner_id = partner.create(cr, uid, {
-                    'name': lead.partner_name or lead.contact_name or lead.name,
-                    'user_id': lead.user_id.id,
-                    'comment': lead.description,
-                    'section_id': lead.section_id.id or False,
-                    'address': []
-        })
+        vals = { 'name': name,
+            'user_id': lead.user_id.id,
+            'comment': lead.description,
+            'section_id': lead.section_id.id or False,
+            'parent_id': parent_id,
+            'phone': lead.phone,
+            'mobile': lead.mobile,
+            'email': lead.email_from and to_email(lead.email_from)[0],
+            'fax': lead.fax,
+            'title': lead.title and lead.title.id or False,
+            'function': lead.function,
+            'street': lead.street,
+            'street2': lead.street2,
+            'zip': lead.zip,
+            'city': lead.city,
+            'country_id': lead.country_id and lead.country_id.id or False,
+            'state_id': lead.state_id and lead.state_id.id or False,
+            'is_company': is_company,
+            'type': 'contact'
+        }
+        partner = partner.create(cr, uid,vals, context)
+        return partner
+
+    def _create_lead_partner(self, cr, uid, lead, context=None):
+        partner_id =  False
+        if lead.partner_name and lead.contact_name:
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
+            self._lead_create_contact(cr, uid, lead, lead.contact_name, False, partner_id, context=context)
+        elif lead.partner_name and not lead.contact_name:
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
+        elif not lead.partner_name and lead.contact_name:
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.contact_name, False, context=context)
+        else:
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.name, False, context=context)
         return partner_id
 
     def _lead_set_partner(self, cr, uid, lead, partner_id, context=None):
@@ -597,29 +604,9 @@ class crm_lead(crm_case, osv.osv):
         if partner_id:
             res_partner.write(cr, uid, partner_id, {'section_id': lead.section_id.id or False})
             contact_id = res_partner.address_get(cr, uid, [partner_id])['default']
-            res = lead.write({'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
-
+            res = lead.write({'partner_id' : partner_id, }, context=context)
         return res
 
-    def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
-        address = self.pool.get('res.partner.address')
-        return address.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'name': lead.contact_name,
-                    'phone': lead.phone,
-                    'mobile': lead.mobile,
-                    'email': lead.email_from and to_email(lead.email_from)[0],
-                    'fax': lead.fax,
-                    'title': lead.title and lead.title.id or False,
-                    'function': lead.function,
-                    'street': lead.street,
-                    'street2': lead.street2,
-                    'zip': lead.zip,
-                    'city': lead.city,
-                    'country_id': lead.country_id and lead.country_id.id or False,
-                    'state_id': lead.state_id and lead.state_id.id or False,
-                })
-
     def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
         """
         This function convert partner based on action.
@@ -632,8 +619,7 @@ class crm_lead(crm_case, osv.osv):
         for lead in self.browse(cr, uid, ids, context=context):
             if action == 'create':
                 if not partner_id:
-                    partner_id = self._lead_create_partner(cr, uid, lead, context=context)
-                self._lead_create_partner_address(cr, uid, lead, partner_id, context=context)
+                    partner_id = self._create_lead_partner(cr, uid, lead, context)
             self._lead_set_partner(cr, uid, lead, partner_id, context=context)
             partner_ids[lead.id] = partner_id
         return partner_ids
@@ -694,9 +680,8 @@ class crm_lead(crm_case, osv.osv):
                     'date' : schedule_time,
                     'section_id' : section_id or False,
                     'partner_id': lead.partner_id and lead.partner_id.id or False,
-                    'partner_address_id': lead.partner_address_id and lead.partner_address_id.id or False,
-                    'partner_phone' : phone or lead.phone or (lead.partner_address_id and lead.partner_address_id.phone or False),
-                    'partner_mobile' : lead.partner_address_id and lead.partner_address_id.mobile or False,
+                    'partner_phone' : phone or lead.phone or (lead.partner_id and lead.partner_id.phone or False),
+                    'partner_mobile' : lead.partner_id and lead.partner_id.mobile or False,
                     'priority': lead.priority,
             }
 
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 830b572676d..e4d32cdaa13 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -103,7 +103,6 @@
         </record>
         
         <record id="crm_case_mgroperations0" model="crm.lead">
-            <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
             <field name="type_id" ref="crm.type_lead3"/>
             <field name="partner_id" ref="base.res_partner_9"/>
@@ -240,7 +239,6 @@
         <!-- Demo Opportunities -->
         <record id="crm_case_construstazunits0" model="crm.lead">
             <field eval="60" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_zen"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead1"/>
@@ -256,7 +254,6 @@
             <field eval="'Conf call with purchase manager'" name="title_action"/>
         </record>
         <record id="crm_case_rdroundfundingunits0" model="crm.lead">
-            <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead2"/>
@@ -307,7 +304,6 @@
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead2"/>
             <field name="partner_id" ref="base.res_partner_accent"/>
-            <field name="partner_address_id" ref="base.res_partner_address_accent"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'open'" name="state"/>
@@ -332,7 +328,6 @@
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead2"/>
             <field name="partner_id" ref="base.res_partner_2"/>
-            <field name="partner_address_id" ref="base.res_partner_address_9"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'open'" name="state"/>
@@ -353,7 +348,6 @@
         </record>
         <record id="crm_case_mediapoleunits0" model="crm.lead">
             <field eval="100" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_3"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead1"/>
@@ -372,7 +366,6 @@
         </record>
         <record id="crm_case_abcfuelcounits0" model="crm.lead">
             <field eval="80" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_marcdubois0"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead1"/>
@@ -397,7 +390,6 @@
         </record>
         <record id="crm_case_dirtminingltdunits25" model="crm.lead">
             <field eval="30" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_wong"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="partner_id" ref="base.res_partner_maxtor"/>
@@ -426,7 +418,6 @@
         </record>
      <record id="crm_case_dirtminingltdunits10" model="crm.lead">
             <field eval="30" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_3000"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
@@ -450,7 +441,6 @@
         </record>
        <record id="crm_case_construstazunits0" model="crm.lead">
             <field eval="60" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_thymbra"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead1"/>
@@ -473,7 +463,6 @@
         </record>
        <record id="crm_case_ericdubois4" model="crm.lead">
             <field eval="65" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_ericdubois0"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead1"/>
@@ -496,7 +485,6 @@
             <field name="country_id" ref="base.be"/>
         </record>
        <record id="crm_case_fabiendupont" model="crm.lead">
-            <field name="partner_address_id" ref="base.res_partner_address_fabiendupont0"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead1"/>
@@ -509,7 +497,6 @@
             <field eval="'Need more info about the onsite intervention'" name="name"/>
         </record>
        <record id="crm_case_shelvehouse" model="crm.lead">
-            <field name="partner_address_id" ref="base.res_partner_address_henrychard1"/>
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_lead1"/>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 777b58ac60a..f7db0357ed8 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -9,7 +9,7 @@
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-        <field name="context">{'search_default_new':1, 'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
+        <field name="context">{'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
         <field name="help">Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect.</field>
     </record>
 
@@ -27,15 +27,7 @@
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
 
-    <menuitem id="base.menu_sales" name="Sales"
-        parent="base.menu_base_partner" sequence="1" />
-
-    <menuitem parent="base.menu_sales" name="Leads"
-        id="menu_crm_case_categ0_act_leads"
-        action="crm_case_category_act_leads_all" sequence="1" />
-
-
-     <act_window
+    <act_window
             id="act_crm_opportunity_crm_phonecall_new"
             name="Phone calls"
             groups="base.group_extended"
@@ -97,12 +89,9 @@ You and your team(s) will be able to plan meetings and phone calls from opportun
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
 
-     <menuitem id="base.menu_sales" name="Sales"
-         parent="base.menu_base_partner" sequence="1" />
-
-     <menuitem name="Opportunities" id="menu_crm_case_opp"
-         parent="base.menu_sales" action="crm_case_category_act_oppor11"
-         sequence="2" />
+    <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1" />
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" />
+    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 44d83f47634..a0a17e9b985 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -24,7 +24,7 @@
     </record>
 
      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
-        groups="base.group_extended" sequence="0"
+        groups="base.group_no_one" sequence="0"
         parent="base.menu_crm_config_lead" />
 
 
@@ -42,7 +42,7 @@
 
         <menuitem action="crm_lead_categ_action"
             id="menu_crm_lead_categ" name="Categories"
-            parent="base.menu_crm_config_lead" sequence="1"/>
+            parent="base.menu_crm_config_lead" sequence="1" groups="base.group_no_one"/>
 
 
         <!-- CRM Lead Form View  -->
@@ -81,7 +81,7 @@
                 <notebook colspan="4">
                 <page string="Lead">
                     <group colspan="4" col="2">
-                        <field name="partner_name" string="Partner Name" />
+                        <field name="partner_name" string="Company Name" />
                     </group>
                     <group colspan="2" col="4">
                         <separator string="Contact" colspan="4" col="4"/>
@@ -176,7 +176,7 @@
                         <field name="channel_id" select="1" widget="selection"/>
                         <field name="referred"/>
                     </group>
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="2" groups="base.group_no_one">
                         <separator string="Dates" colspan="2" col="2"/>
                         <field name="create_date"/>
                         <field name="write_date"/>
@@ -188,7 +188,7 @@
                         <field name="optin" on_change="on_change_optin(optin)"/>
                         <field name="optout" on_change="on_change_optout(optout)"/>
                     </group>
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="2" groups="base.group_no_one">
                         <separator string="Statistics" colspan="2" col="2"/>
                         <field name="day_open"/>
                         <field name="day_close"/>
@@ -208,7 +208,7 @@
         <field name="arch" type="xml">
             <tree string="Leads"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
                 <field name="date_deadline" invisible="1"/>
-                <field name="create_date"/>
+                <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>
                 <field name="contact_name"/>
                 <field name="country_id" invisible="context.get('invisible_country', True)" />
@@ -259,7 +259,6 @@
                 date_start="date_action" color="user_id">
                 <field name="name" />
                 <field name="partner_name" />
-                <field name="partner_address_id" />
             </calendar>
         </field>
     </record>
@@ -304,7 +303,10 @@
                                             <field name="company_currency"/>
                                         </t>
                                     </td>
-                                    <td valign="top" width="22"><img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/></td>
+                                    <td valign="top" width="22">
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
+                                        width="22" height="22" class="oe_kanban_gravatar"/>
+                                    </td>
                                 </tr>
                                 </table>
 
@@ -417,9 +419,9 @@
                     <separator orientation="vertical"/>
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
+                    <separator orientation="vertical" groups="base.group_no_one"/>
                     <filter string="Creation" help="Create date" icon="terp-go-month"
-                        domain="[]" context="{'group_by':'create_date'}" />
+                        domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
            </search>
         </field>
@@ -479,10 +481,7 @@
                                 string="Create"
                                 attrs="{'invisible':[('partner_id','!=',False)]}"/>
                         </group>
-                        <field name="partner_address_id"
-                            string="Contact"
-                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                            colspan="1" />
+                        
                         <group col="3" colspan="2">
                             <field name="email_from" string="Email" />
                             <button string="Mail"
@@ -570,7 +569,7 @@
                        icon="terp-mail-message-new" type="action"/>
                 </page>
                 <page string="Extra Info" groups="base.group_extended">
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" groups="base.group_no_one">
                         <separator string="Dates" colspan="2"/>
                         <field name="create_date"/>
                         <field name="write_date"/>
@@ -580,8 +579,8 @@
                     <group col="2" colspan="2">
                         <separator string="Misc" colspan="2"/>
                         <field name="active"/>
-                        <field name="day_open"/>
-                        <field name="day_close"/>
+                        <field name="day_open" groups="base.group_no_one"/>
+                        <field name="day_close" groups="base.group_no_one"/>
                         <field name="referred"/>
                     </group>
                     <separator colspan="4" string="References"/>
@@ -601,7 +600,7 @@
         <field name="arch" type="xml">
             <tree string="Opportunities" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                 <field name="date_deadline" invisible="1"/>
-                <field name="create_date"/>
+                <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Opportunity"/>
                 <field name="partner_id" string="Customer"/>
                 <field name="country_id" invisible="context.get('invisible_country', True)" />
@@ -682,7 +681,7 @@
                     <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical" />
-                    <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" />
+                    <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
             </search>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 40ba8662f13..3b4d701590c 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -47,8 +47,6 @@ class crm_meeting(crm_base, osv.osv):
         # From crm.case
         'name': fields.char('Summary', size=124, required=True, states={'done': [('readonly', True)]}),
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]", states={'done': [('readonly', True)]}),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', states={'done': [('readonly', True)]}, \
                         select=True, help='Sales team to which Case belongs to.'),
         'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."),
diff --git a/addons/crm/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml
index 87d49d2f635..7427afe1e58 100644
--- a/addons/crm/crm_meeting_demo.xml
+++ b/addons/crm/crm_meeting_demo.xml
@@ -7,7 +7,6 @@
 
 	<!--For Meetings-->
 		<record id="crm_case_followuponproposal0" model="crm.meeting">
-			<field name="partner_address_id" ref="base.res_partner_address_wong"/>
 			<field eval="1" name="active"/>
 			<field name="partner_id" ref="base.res_partner_maxtor"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -22,7 +21,6 @@
 		</record>
 	
 		<record id="crm_case_initialdiscussion0" model="crm.meeting">
-			<field name="partner_address_id" ref="base.res_partner_address_2"/>
 			<field eval="1" name="active"/>
 			<field eval="7.0" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_10"/>
@@ -37,7 +35,6 @@
 		</record>
 	
 		<record id="crm_case_discusspricing0" model="crm.meeting">
-			<field name="partner_address_id" ref="base.res_partner_address_zen"/>
 			<field eval="1" name="active"/>
 			<field eval="3.0" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_3"/>
@@ -52,7 +49,6 @@
 		</record>
 
 		<record id="crm_case_reviewneeds0" model="crm.meeting">
-			<field name="partner_address_id" ref="base.res_partner_address_15"/>
 			<field eval="1" name="active"/>
 			<field eval="6.0" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_11"/>
@@ -66,7 +62,6 @@
 		</record>
 
 		<record id="crm_case_changesindesigning0" model="crm.meeting">
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
 			<field eval="1" name="active"/>
 			<field eval="05" name="duration"/>
 			<field name="partner_id" ref="base.res_partner_9"/>
@@ -81,7 +76,6 @@
 		</record>
 	
 		<record id="crm_case_updatethedata0" model="crm.meeting">
-			<field name="partner_address_id" ref="base.res_partner_address_7"/>
 			<field eval="1" name="active"/>
 			<field name="partner_id" ref="base.res_partner_4"/>
 			<field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index af50149f693..7c0b2f6cfa4 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -87,12 +87,12 @@
 
 <!-- ALL MEETINGS -->
 
-    <menuitem name="Meetings" id="menu_meeting_sale"
-        parent="base.menu_base_partner" sequence="3"/>
+    <menuitem name="Import &amp; Synchronize" id="base.menu_import_crm"
+        parent="base.menu_base_partner"/>
 
     <menuitem name="Meetings" id="menu_crm_case_categ_meet"
-        action="crm_case_categ_meet" parent="menu_meeting_sale"
-        sequence="1" />
+        action="crm_case_categ_meet" parent="base.menu_sales"
+        sequence="7" />
 
     <record id="action_view_attendee_form" model="ir.actions.act_window">
          <field name="name">Meeting Invitations</field>
@@ -106,10 +106,6 @@
         <field name="help">With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer.</field>
      </record>
 
-    <menuitem id="menu_attendee_invitations"
-            name="Meeting Invitations" parent="crm.menu_meeting_sale"
-            sequence="10" action="action_view_attendee_form"
-            groups="base.group_no_one" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 527f5814be4..d94fe9e8566 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -15,7 +15,7 @@
     </record>
 
      <menuitem action="crm_meeting_categ_action"
-        groups="base.group_extended"
+        groups="base.group_no_one"
         id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
 
     <!-- CRM Meetings Form View -->
@@ -60,9 +60,6 @@
                             <separator colspan="2" string="Contacts"/>
                             <field name="partner_id" string="Partner"
                                 on_change="onchange_partner_id(partner_id)" />
-                            <field name="partner_address_id"
-                                string="Contact"
-                                on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                             <field name="email_from"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Visibility"/>
@@ -156,7 +153,6 @@
                                     </page>
                                     <page string="Other">
                                         <field name="user_id"/>
-                                        <field name="partner_address_id" select="1" />
                                         <newline />
                                     </page>
                                 </notebook>
@@ -167,9 +163,9 @@
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period" />
-                                <field name="interval" />                               
-                                                       
-                                
+                                <field name="interval" />
+
+
                                 <separator string="End of recurrency" colspan="4"/>
                                 <field name="end_type" />
                                 <label string=" " colspan="2" />
@@ -179,8 +175,8 @@
                                 <newline />
                                 <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
                                 <newline />
-                           
-                      
+
+
                             </group>
                             <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
                                 <separator string="Choose day where repeat the meeting" colspan="8"/>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 8d9a47b15eb..c6a59d9aace 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -44,8 +44,6 @@ class crm_phonecall(crm_base, osv.osv):
                         select=True, help='Sales team to which Case belongs to.'),
         'user_id': fields.many2one('res.users', 'Responsible'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
         'state': fields.selection([
@@ -67,8 +65,6 @@ class crm_phonecall(crm_base, osv.osv):
                         domain="['|',('section_id','=',section_id),('section_id','=',False),\
                         ('object_id.model', '=', 'crm.phonecall')]"),
         'partner_phone': fields.char('Phone', size=32),
-        'partner_contact': fields.related('partner_address_id', 'name', \
-                                 type="char", string="Contact", size=128),
         'partner_mobile': fields.char('Mobile', size=32),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True), 
@@ -90,16 +86,6 @@ class crm_phonecall(crm_base, osv.osv):
         'active': 1,
     }
 
-    # From crm.case
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        res = super(crm_phonecall, self).onchange_partner_address_id(cr, uid, ids, add, email)
-        res.setdefault('value', {})
-        if add:
-            address = self.pool.get('res.partner.address').browse(cr, uid, add)
-            res['value']['partner_phone'] = address.phone
-            res['value']['partner_mobile'] = address.mobile
-        return res
-
     def case_close(self, cr, uid, ids, *args):
         """Overrides close for crm_case for setting close date
         """
@@ -153,7 +139,6 @@ class crm_phonecall(crm_base, osv.osv):
                     'date' : schedule_time,
                     'section_id' : section_id or False,
                     'partner_id': call.partner_id and call.partner_id.id or False,
-                    'partner_address_id': call.partner_address_id and call.partner_address_id.id or False,
                     'partner_phone' : call.partner_phone,
                     'partner_mobile' : call.partner_mobile,
                     'priority': call.priority,
@@ -180,9 +165,9 @@ class crm_phonecall(crm_base, osv.osv):
         return self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
 
     def _call_create_partner_address(self, cr, uid, phonecall, partner_id, context=None):
-        address = self.pool.get('res.partner.address')
+        address = self.pool.get('res.partner')
         return address.create(cr, uid, {
-                    'partner_id': partner_id,
+                    'parent_id': partner_id,
                     'name': phonecall.name,
                     'phone': phonecall.partner_phone,
         })
@@ -227,7 +212,6 @@ class crm_phonecall(crm_base, osv.osv):
 
     def convert_opportunity(self, cr, uid, ids, opportunity_summary=False, partner_id=False, planned_revenue=0.0, probability=0.0, context=None):
         partner = self.pool.get('res.partner')
-        address = self.pool.get('res.partner.address')
         opportunity = self.pool.get('crm.lead')
         opportunity_dict = {}
         default_contact = False
@@ -237,14 +221,12 @@ class crm_phonecall(crm_base, osv.osv):
             if partner_id:
                 address_id = partner.address_get(cr, uid, [partner_id])['default']
                 if address_id:
-                    default_contact = address.browse(cr, uid, address_id, context=context)
+                    default_contact = partner.browse(cr, uid, address_id, context=context)
             opportunity_id = opportunity.create(cr, uid, {
                             'name': opportunity_summary or call.name,
                             'planned_revenue': planned_revenue,
                             'probability': probability,
                             'partner_id': partner_id or False,
-                            'partner_address_id': default_contact and default_contact.id, 
-                            'phone': default_contact and default_contact.phone,
                             'mobile': default_contact and default_contact.mobile,
                             'section_id': call.section_id and call.section_id.id or False,
                             'description': call.description or False,
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index e80930284f4..614b93f2bc1 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -5,7 +5,6 @@
 		((((((((((( Demo Cases ))))))))))) 
 	-->
 		<record id="crm_case_phone01" model="crm.phonecall">
-			<field name="partner_address_id" ref="base.res_partner_address_15"/>
 			<field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
 			<field name="partner_id" ref="base.res_partner_11"/>
 			<field eval="&quot;3&quot;" name="priority"/>
@@ -21,7 +20,6 @@
 			<field eval="&quot;done&quot;" name="state"/>
 		</record>
 		<record id="crm_case_phone02" model="crm.phonecall">
-			<field name="partner_address_id" ref="base.res_partner_address_6"/>
 			<field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
 			<field name="partner_id" ref="base.res_partner_6"/>
 			<field eval="&quot;4&quot;" name="priority"/>
@@ -37,7 +35,6 @@
 			<field eval="&quot;done&quot;" name="state"/>
 		</record>
 		<record id="crm_case_phone03" model="crm.phonecall">
-			<field name="partner_address_id" ref="base.res_partner_address_2"/>
 			<field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
 			<field name="partner_id" ref="base.res_partner_10"/>
 			<field eval="&quot;2&quot;" name="priority"/>
@@ -68,7 +65,6 @@
 			<field eval="3.45" name="duration"/>
 		</record>
 		<record id="crm_case_phone05" model="crm.phonecall">
-			<field name="partner_address_id" ref="base.res_partner_address_10"/>
 			<field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
 			<field name="partner_id" ref="base.res_partner_5"/>
 			<field eval="&quot;3&quot;" name="priority"/>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index d8d00710420..4b7174028ed 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -105,7 +105,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain">[('state','!=','done')]</field>
-        <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1}'"/>
+        <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\'}'"/>
         <field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
         <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 34ef2612623..74a6a7ec6aa 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -15,7 +15,7 @@
     </record>
 
     <menuitem action="crm_phonecall_categ_action" name="Categories"
-        id="menu_crm_case_phonecall-act" parent="menu_crm_config_phonecall" />
+        id="menu_crm_case_phonecall-act" parent="menu_crm_config_phonecall" groups="base.group_no_one"/>
 
 <!--  PhoneCalls Tree View -->
 
@@ -28,7 +28,6 @@
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"/>
-                <field name="partner_contact"/>
                 <field name="partner_phone"/>
                 <field name="user_id"/>
                 <field name="categ_id" invisible="1"/>
@@ -88,11 +87,9 @@
                         icon="terp-partner"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}" 
+                        attrs="{'invisible':[('partner_id','!=',False)]}"
                         groups="base.group_partner_manager"/>
                     <newline/>
-                    <field name="partner_address_id"
-                        on_change="onchange_partner_address_id(partner_address_id)" />
                     <newline/>
                     <field name="partner_mobile" />
                 </group>
@@ -140,9 +137,6 @@
                 <field name="partner_id"
                     on_change="onchange_partner_id(partner_id)"
                     string="Partner" />
-                <field name="partner_address_id"
-                        on_change="onchange_partner_address_id(partner_address_id)"
-                        invisible="1"/>
                 <field name="partner_phone"
                     invisible="1"/>
                 <field name="user_id" groups="base.group_extended"/>
@@ -239,7 +233,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Scheduled Phonecalls">
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>    
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
                <separator orientation="vertical"/>
                <filter icon="terp-go-today" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
@@ -281,7 +275,7 @@
                </group>
            </search>
         </field>
-    </record>   
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index c1203d27659..3df7b002cec 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,11 +2,11 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" 
+        <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
             groups="base.group_sale_manager,base.group_sale_salesman"/>
 
-        <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
-            parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
+        <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities" 
+            parent="base.menu_base_config" sequence="80" groups="base.group_sale_manager"/>
 
         <menuitem id="base.menu_crm_config_opportunity" name="Opportunities"
             parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
@@ -15,10 +15,12 @@
             parent="base.menu_base_config" sequence="0" groups="base.group_sale_manager"/>
 
         <menuitem id="menu_crm_config_phonecall" name="Phone Calls"
-            parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
+            parent="base.menu_base_config" sequence="45" groups="base.group_extended"/>
+
+        <menuitem id="base.next_id_64" name="Sales"
+            parent="base.menu_reporting" sequence="1" />
 
-        <menuitem id="base.next_id_64" name="Reporting"
-            parent="base.menu_base_partner" sequence="11" />
+		<menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="75"/>			
 
 
         <!-- crm.case.channel -->
@@ -52,7 +54,7 @@
             <field name="help">Track from where is coming your leads and opportunities by creating specific channels that will be maintained at the creation of a document in the system. Some examples of channels can be: Website, Phone Call, Reseller, etc.</field>
         </record>
 
-        <menuitem action="crm_case_channel_action" id="menu_crm_case_channel" parent="base.menu_crm_config_lead" sequence="4"/>
+        <menuitem action="crm_case_channel_action" id="menu_crm_case_channel" parent="base.menu_crm_config_lead" sequence="4" groups="base.group_no_one"/>
 
         <!-- Case Sections Form View -->
 
@@ -126,8 +128,8 @@
         </record>
 
         <menuitem action="crm_case_section_act"
-            id="menu_crm_case_section_act" sequence="4"
-            parent="base.menu_sale_config_sales" />
+            id="menu_crm_case_section_act" sequence="15"
+            parent="base.menu_sales_configuration_misc" groups="base.group_no_one"/>
 
 
         <!-- CRM Stage Tree View -->
@@ -246,7 +248,7 @@
 
          <menuitem action="crm_case_resource_type_act"
             id="menu_crm_case_resource_type_act" sequence="4"
-            groups="base.group_extended"
+            groups="base.group_no_one"
             parent="base.menu_crm_config_lead" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
@@ -371,8 +373,8 @@
 
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_extended" sequence="2"
-            parent="base.menu_base_action_rule" />
+            groups="base.group_extended" sequence="15"
+            parent="base.menu_base_config" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 3410c074fe1..ca93cb53145 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-20 03:23+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-03-22 16:17+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n"
-"X-Generator: Launchpad (build 14838)\n"
+"X-Launchpad-Export-Date: 2012-03-23 04:41+0000\n"
+"X-Generator: Launchpad (build 14996)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -291,7 +291,7 @@ msgstr "状态"
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Categories"
-msgstr "类型"
+msgstr "分类"
 
 #. module: crm
 #: view:crm.lead:0
@@ -419,7 +419,7 @@ msgstr "这默认百分比描述业务在这阶段的平均的成功概率"
 #: field:crm.phonecall.report,categ_id:0
 #: field:crm.phonecall2phonecall,categ_id:0
 msgid "Category"
-msgstr "类型"
+msgstr "分类"
 
 #. module: crm
 #: view:crm.lead:0
@@ -561,7 +561,7 @@ msgstr "满意度计算"
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "业务类型"
+msgstr "业务分类"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -605,7 +605,7 @@ msgstr "电话访问"
 msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
-msgstr "这业务伙伴类型将加到计算匹配业务伙伴的业务伙伴细分规则中"
+msgstr "该业务伙伴分类将加到计算匹配业务伙伴的业务伙伴细分规则中"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
@@ -870,7 +870,7 @@ msgstr "商机列表"
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "业务伙伴类型"
+msgstr "业务伙伴分类"
 
 #. module: crm
 #: view:crm.add.note:0
@@ -1209,7 +1209,7 @@ msgstr "预期收益"
 msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
-msgstr "在系统中创建指定的电话访问类型以方便定义电话访问跟踪类型"
+msgstr "在系统中创建指定的电话访问分类以方便定义电话访问跟踪类型"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1403,7 +1403,7 @@ 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
@@ -1454,7 +1454,7 @@ msgid ""
 "Create specific partner categories which you can assign to your partners to "
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
-msgstr "创建指定的业务伙伴类型，细分规则可以根据你设定的规则去指定业务伙伴的类型，以便你可以为更好管理他们和他们互动。"
+msgstr "创建指定的业务伙伴类型，细分规则可以根据你设定的规则去指定业务伙伴的分类，以便你可以为更好管理他们和他们互动。"
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1529,7 +1529,7 @@ msgstr "邮件"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr "电话访问类型"
+msgstr "电话访问分类"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1810,12 +1810,12 @@ msgstr "值"
 #. module: crm
 #: help:crm.lead,type:0 help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "类型用于区分线索和商机"
+msgstr "类型用于区分销售线索和商机"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr "商机类型"
+msgstr "商机按分类分组"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_name:0
@@ -1973,7 +1973,7 @@ msgstr "错误！"
 msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
-msgstr "创建不同类型的会议以便更好组织和把会议分类"
+msgstr "创建不同的会议分类以便更好组织和把会议分类"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2954,7 +2954,7 @@ msgstr "探查商机"
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr "设类型为"
+msgstr "设置分类为"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3111,7 +3111,7 @@ msgstr "联系人列表"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr "计算兴趣"
+msgstr "对计算机有兴趣"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3171,7 +3171,7 @@ msgstr "会议"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr "业务类型"
+msgstr "业务分类"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3205,7 +3205,7 @@ msgstr "关闭或取消状态的线索不能转为商机"
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr "会议类型"
+msgstr "会议分类"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -3565,7 +3565,7 @@ msgstr "选项"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Negotiation"
-msgstr "协商"
+msgstr "谈判"
 
 #. module: crm
 #: view:crm.lead:0
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 32fbe65c337..b2cb3b1bfea 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -263,10 +263,10 @@
 
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
             groups="base.group_extended"
-            parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
+            parent="base.next_id_64" action="action_report_crm_lead" sequence="1"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
-            parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
+            parent="base.next_id_64" action="action_report_crm_opportunity" sequence="5"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index e171388d08f..f745d93e3ef 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -157,7 +157,7 @@
         <menuitem name="Phone Calls Analysis"
             groups="base.group_extended"
             action="action_report_crm_phonecall"
-            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
+            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="15"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index aed75041b60..b4a9e368d4c 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -52,12 +52,6 @@ class crm_configuration(osv.osv_memory):
         'module_wiki_sale_faq': fields.boolean("Install a sales FAQ",
             help="""This provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki Sale FAQ.
                 This installs the module wiki_sale_faq."""),
-        'module_base_contact': fields.boolean("Manage a several addresses per customer",
-            help="""Lets you define:
-                    * contacts unrelated to a partner,
-                    * contacts working at several addresses (possibly for different partners),
-                    * contacts with possibly different job functions.
-                This installs the module base_contact."""),
         'module_google_map': fields.boolean("Google maps on customer",
             help="""Locate customers on Google Map.
                 This installs the module google_map."""),
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index ea9038c79b5..c908125a2bf 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data>
 
-        <record id="view_sales_config_crm" model="ir.ui.view">
+        <record id="view_sale_config_settings" model="ir.ui.view">
             <field name="name">crm settings</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="config_emails" position="after">
+                <group name="config_fetchmail" position="after">
                     <field name="fetchmail_lead"/>
                     <group colspan="2" attrs="{'invisible': [('fetchmail_lead','=',False)]}">
                         <field name="lead_server" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
@@ -18,7 +18,9 @@
                         <field name="lead_user" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
                         <field name="lead_password" password="True" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
                     </group>
+                    <newline/>
                 </group>
+
                 <group name="config_crm" position="after">
                     <separator string="Import and Synchronize data from an other application" colspan="4"/>
                     <field name="module_import_sugarcrm"/>
@@ -29,7 +31,6 @@
                     <field name="module_wiki_sale_faq" />
 
                     <separator string="Customer Form" colspan="4"/>
-                    <field name="module_base_contact"/>
                     <field name="module_google_map"/>
                 </group>
             </field>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 2bccdeed235..3d43bc76022 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -50,21 +50,18 @@ class res_partner(osv.osv):
         return value
 
     def make_opportunity(self, cr, uid, ids, opportunity_summary, planned_revenue=0.0, probability=0.0, partner_id=None, context=None):
-        categ = self.pool.get('crm.case.categ')
-        address = self.address_get(cr, uid, ids)
-        categ_ids = categ.search(cr, uid, [('object_id.model','=','crm.lead')])
-        lead = self.pool.get('crm.lead')
+        categ_obj = self.pool.get('crm.case.categ')
+        categ_ids = categ_obj.search(cr, uid, [('object_id.model','=','crm.lead')])
+        lead_obj = self.pool.get('crm.lead')
         opportunity_ids = {}
         for partner in self.browse(cr, uid, ids, context=context):
-            address = self.address_get(cr, uid, [partner.id])['default']
             if not partner_id:
                 partner_id = partner.id
-            opportunity_id = lead.create(cr, uid, {
+            opportunity_id = lead_obj.create(cr, uid, {
                 'name' : opportunity_summary,
                 'planned_revenue' : planned_revenue,
                 'probability' : probability,
                 'partner_id' : partner_id,
-                'partner_address_id' : address,
                 'categ_id' : categ_ids and categ_ids[0] or '',
                 'state' :'draft',
                 'type': 'opportunity'
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index bcb11fe6b11..8e01d9d6bea 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -24,7 +24,7 @@
                 <field name="inherit_id" ref="base.view_partner_tree"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
-                    <field name="country" position="after">
+                    <field name="phone" position="after">
                         <field name="section_id" completion="1" widget="selection"
                             groups="base.group_extended"/>
                     </field>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index ed3d86bf9b8..949cd5d4e73 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -17,9 +17,10 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record model="res.users" id="base.user_admin">
+    <record model="res.users" id="base.user_root">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
 
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 47a0f8fa13a..7707118324f 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -26,13 +26,11 @@ access_crm_case_resource_type_manager,crm_case_resource_type manager,model_crm_c
 access_crm_phonecall_report_user,crm.phonecall.report.user,model_crm_phonecall_report,base.group_sale_salesman,1,0,0,0

 access_crm_phonecall_report_manager,crm.phonecall.report,model_crm_phonecall_report,base.group_sale_manager,1,1,1,1

 access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0

-access_res_partner_address_manager,res.partner.address.crm.user.manager,base.model_res_partner_address,base.group_sale_manager,1,0,0,0

 access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,base.group_sale_manager,1,0,0,0

 mail_mail_message_manager,mail.message.manager,mail.model_mail_message,base.group_sale_manager,1,0,0,0

 access_calendar_attendee_crm_user,calendar.attendee.crm.user,model_calendar_attendee,base.group_sale_salesman,1,1,1,0

 access_calendar_attendee_crm_manager,calendar.attendee.crm.manager,model_calendar_attendee,base.group_sale_manager,1,1,1,1

 access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0

-access_res_partner_address,res.partner.address.crm.user,base.model_res_partner_address,base.group_sale_salesman,1,1,1,0

 access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0

 mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1

 mail_gateway_mail_message_user,mail.message.user,mail.model_mail_message,base.group_sale_salesman,1,1,1,1

diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 83d2ce915ac..ec30f024fca 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -55,4 +55,4 @@
     assert partner_id, "Customer is not found in regular customer list."
     data = self.browse(cr, uid, partner_id, context=context)[0]
     assert data.user_id.id == ref("base.user_root"), "User not assign properly"
-    assert data.name == "Bad time", "User not assign properly"
+    assert data.name == "Bad time", "Bad partner name"
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 52a79e4514c..f6fd4332745 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -67,8 +67,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity'), '!', ('state', 'in', ['done', 'cancel'])])
             if ids:
                 opportunities.append(ids[0])
-                
-                
         if not partner_id:
             label = False
             opp_ids = []
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index ed2a8e7fd1c..873dd6ab36e 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -55,9 +55,9 @@ class crm_opportunity2phonecall(osv.osv_memory):
             if 'note' in fields:
                 res.update({'note': opp.description})
             if 'contact_name' in fields:
-                res.update({'contact_name': opp.partner_address_id and opp.partner_address_id.name or False})
+                res.update({'contact_name': opp.partner_id and opp.partner_id.name or False})
             if 'phone' in fields:
-                res.update({'phone': opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False)})
+                res.update({'phone': opp.phone or (opp.partner_id and opp.partner_id.phone or False)})
         return res
 
     def action_schedule(self, cr, uid, ids, context=None):
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index a12bd92115c..d4b8a142992 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -18,9 +18,8 @@
                     <newline/>
                     <field name="partner_id" readonly="True"/>
                     <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="contact_name"/>
                     <field name="phone"/>
-                    <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>                    
+                    <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
                     <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
                     <separator string="Notes" colspan="4"/>
                     <field name="note" colspan="4" nolabel="1"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 0fa077bbf42..422af02f99d 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -38,17 +38,13 @@ class crm_phonecall2partner(osv.osv_memory):
 
         phonecall_obj = self.pool.get('crm.phonecall')
         partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
         rec_ids = context and context.get('active_ids', [])
         value = {}
-
+        partner_id = False
         for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
             partner_ids = partner_obj.search(cr, uid, [('name', '=', phonecall.name or phonecall.name)])
-            if not partner_ids and phonecall.email_from:
-                address_ids = contact_obj.search(cr, uid, ['|', ('phone', '=', phonecall.partner_phone), ('mobile','=',phonecall.partner_mobile)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+            if not partner_ids and (phonecall.partner_phone or phonecall.partner_mobile):
+                partner_ids = partner_obj.search(cr, uid, ['|', ('phone', '=', phonecall.partner_phone), ('mobile','=',phonecall.partner_mobile)])
 
             partner_id = partner_ids and partner_ids[0] or False
         return partner_id
diff --git a/addons/crm/wizard/mail_compose_message.py b/addons/crm/wizard/mail_compose_message.py
index 512d9ece77a..b82c3083f3a 100644
--- a/addons/crm/wizard/mail_compose_message.py
+++ b/addons/crm/wizard/mail_compose_message.py
@@ -50,7 +50,7 @@ class mail_compose_message(osv.osv_memory):
                     'subject' : data.name or False,
                     'email_to' : data.email_from or False,
                     'email_from' : user.user_email or tools.config.get('email_from', False),
-                    'body_text' : '\n' + tools.ustr(user.signature),
+                    'body_text' : '\n' + tools.ustr(user.signature or ''),
                     'email_cc' : tools.ustr(data.email_cc or ''),
                     'model': model,
                     'res_id': res_id,
diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index a610095d6a6..287e301532e 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -11,14 +11,14 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-    
+
         <menuitem
-            name="Synchronize This Calendar"
+            name="Synchronize Your Meetings"
             action="action_caldav_browse"
             id="menu_caldav_browse"
             icon="STOCK_EXECUTE"
-            parent="crm.menu_meeting_sale" sequence="1"/>
-            
-        
+            parent="base.menu_import_crm" sequence="10"/>
+
+
     </data>
-</openerp> 
+</openerp>
diff --git a/addons/crm_caldav/i18n/ja.po b/addons/crm_caldav/i18n/ja.po
new file mode 100644
index 00000000000..6eae3bc9581
--- /dev/null
+++ b/addons/crm_caldav/i18n/ja.po
@@ -0,0 +1,33 @@
+# 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-01 05:49+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-02 04:37+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr "Caldavブラウズ"
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronize This Calendar"
+msgstr "このカレンダーを同期化する"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "ミーティング"
diff --git a/addons/crm_caldav/i18n/pl.po b/addons/crm_caldav/i18n/pl.po
new file mode 100644
index 00000000000..748beb9313f
--- /dev/null
+++ b/addons/crm_caldav/i18n/pl.po
@@ -0,0 +1,33 @@
+# Polish 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-03-28 14:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish <pl@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-03-29 04:35+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronize This Calendar"
+msgstr "Synchronizuj ten kalendarz"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Zebranie"
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index fb6b8f90bda..32562501901 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -70,9 +70,6 @@ class crm_claim(crm.crm_case, osv.osv):
                                 " mail gateway."),
         'company_id': fields.many2one('res.company', 'Company'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                # domain="[('partner_id','=',partner_id)]"
-                                 ),
         'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'partner_phone': fields.char('Phone', size=32),
@@ -89,7 +86,6 @@ class crm_claim(crm.crm_case, osv.osv):
     _defaults = {
         'user_id': crm.crm_case._get_default_user,
         'partner_id': crm.crm_case._get_default_partner,
-        'partner_address_id': crm.crm_case._get_default_partner_address,
         'email_from':crm.crm_case. _get_default_email,
         'state': lambda *a: 'draft',
         'section_id':crm.crm_case. _get_section,
@@ -105,23 +101,11 @@ class crm_claim(crm.crm_case, osv.osv):
            :param email: ignored
         """
         if not part:
-            return {'value': {'partner_address_id': False,
-                            'email_from': False,
-                            'partner_phone': False
-                            }}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
-        data = {'partner_address_id': addr['contact']}
-        data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        return {'value': data}
-
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        """This function returns value of partner email based on Partner Address
-           :param part: Partner's id
-           :param email: ignored
-        """
-        if not add:
-            return {'value': {'email_from': False}}
-        address = self.pool.get('res.partner.address').browse(cr, uid, add)
+            return {'value': {'email_from': False,
+                              'partner_phone': False
+                            }
+                   }
+        address = self.pool.get('res.partner').browse(cr, uid, part)
         return {'value': {'email_from': address.email, 'partner_phone': address.phone}}
 
     def case_open(self, cr, uid, ids, *args):
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index 8279e04eb6f..592e655b489 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -7,7 +7,6 @@
     -->
     
         <record id="crm_case_claim01" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_15"/>
             <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
             <field name="partner_id" ref="base.res_partner_11"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -21,7 +20,6 @@
         </record>
         
         <record id="crm_case_claim02" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_6"/>
             <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
             <field name="partner_id" ref="base.res_partner_6"/>
             <field eval="&quot;4&quot;" name="priority"/>
@@ -35,7 +33,6 @@
         </record>
         
         <record id="crm_case_claim03" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_2"/>
             <field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field eval="&quot;2&quot;" name="priority"/>
@@ -63,7 +60,6 @@
         </record>
         
         <record id="crm_case_claim05" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_10"/>
             <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
             <field name="partner_id" ref="base.res_partner_5"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -77,7 +73,6 @@
         </record>
         
         <record id="crm_case_claim06" model="crm.claim">
-            <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index f33b6f7ad31..c54f161dab3 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <menuitem
+            icon="terp-project" id="base.menu_main_pm"
+            name="Project" sequence="10"
+            groups="base.group_extended,base.group_sale_salesman"
+            web_icon="images/project.png"
+            web_icon_hover="images/project-hover.png"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_extended,base.group_sale_salesman"
-            parent="base.menu_base_partner" sequence="7" />
+            parent="base.menu_main_pm" sequence="2" />
 
         <!-- Claims Menu -->
 
@@ -14,7 +20,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
-            <field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid, "stage_type":'claim'}</field>
+            <field name="context">{'search_default_section_id': section_id,"search_default_user_id":uid, "stage_type":'claim'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
             <field name="help">Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.</field>
         </record>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6bb7e089baa..ada4db06237 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -4,7 +4,7 @@
 
         <menuitem id="menu_config_claim" name="Claim"
             groups="base.group_extended"
-            parent="base.menu_base_config" sequence="6" />
+            parent="base.menu_base_config" sequence="55" />
 
         <!-- Claims categories  -->
 
@@ -19,7 +19,7 @@
         </record>
 
         <menuitem action="crm_claim_categ_action" name="Categories"
-            id="menu_crm_case_claim-act" parent="menu_config_claim" />
+            id="menu_crm_case_claim-act" parent="menu_config_claim" groups="base.group_no_one"/>
 
         <!-- Claim Stages -->
 
@@ -90,8 +90,6 @@
                                     <separator colspan="2" string="Claim Reporter"/>
                                     <field name="partner_id" string="Partner"
                                         on_change="onchange_partner_id(partner_id)" />
-                                    <field name="partner_address_id" string="Contact"
-                                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                                     <field name="partner_phone"/>
                                     <field name="email_from" widget="email"/>
                                 </group>
@@ -130,7 +128,7 @@
                                     <field name="date_action_next"/>
                                     <field name="action_next"/>
                                 </group>
-                                <group colspan="2" col="2">
+                                <group colspan="2" col="2" groups="base.group_no_one">
                                     <separator colspan="2" string="Dates"/>
                                     <field name="create_date"/>
                                     <field name="date_closed"/>
@@ -245,7 +243,7 @@
                             context="{'group_by':'date_deadline'}" />
                         <filter string="Closure" icon="terp-go-month"
                             domain="[]" help="Date Closed"
-                            context="{'group_by':'date_closed'}" />
+                            context="{'group_by':'date_closed'}"  groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
@@ -261,7 +259,7 @@
                     <attribute name="invisible">False</attribute>
                 </xpath>
             </field>
-        </record>    
+        </record>
         <record id="view_claim_partner_info_form1" model="ir.ui.view">
             <field name="name">res.partner.claim.info.form</field>
             <field name="model">res.partner</field>
@@ -279,7 +277,7 @@
                     </xpath>
                 </data>
             </field>
-        </record>        
+        </record>
 
         <act_window
             context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
@@ -289,15 +287,5 @@
             res_model="crm.claim"
             src_model="res.partner"/>
 
-
-        <act_window
-            domain="[('partner_address_id', '=', active_id)]"
-            context="{'default_partner_address_id': active_id}"
-            id="act_claim_partner_address"
-            name="Claims"
-            view_mode="tree,form"
-            res_model="crm.claim"
-            src_model="res.partner.address"/>
-
      </data>
 </openerp>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 4505c72237c..adf4b17c949 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -190,9 +190,13 @@
             <field name="act_window_id" ref="action_report_crm_claim"/>
         </record>
 
+        <menuitem id="base.menu_project_report" name="Project"
+            groups="base.group_extended"
+            parent="base.menu_reporting" sequence="30"/>
+
         <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
             groups="base.group_extended"
-            action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
+            action="action_report_crm_claim" parent="base.menu_project_report" sequence="15"/>
 
 
     </data>
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
index cf9c4294809..73a6680663d 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/crm_claim/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 37d985b8a1e..c6c66290303 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="priority" eval="12"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-                <group name="config_emails" position="after">
+                <group name="config_fetchmail" position="after">
                     <field name="fetchmail_claim"/>
                     <group colspan="2" attrs="{'invisible': [('fetchmail_claim','=',False)]}">
                         <field name="claim_server" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
@@ -19,6 +19,7 @@
                         <field name="claim_user" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
                         <field name="claim_password" password="True" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
                     </group>
+                    <newline/>
                 </group>
             </field>
         </record>
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 37c5bb8ccee..76d0ca8fdd5 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -47,8 +47,6 @@ class crm_fundraising(crm.crm_case, osv.osv):
                             select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'),
             'company_id': fields.many2one('res.company', 'Company'),
             'partner_id': fields.many2one('res.partner', 'Partner'),
-            'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"),
             'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
             'email_from': fields.char('Email', size=128, help="These people will receive email."),
             'date_closed': fields.datetime('Closed', readonly=True),
@@ -100,7 +98,6 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'active': 1,
             'user_id': crm.crm_case._get_default_user,
             'partner_id': crm.crm_case._get_default_partner,
-            'partner_address_id': crm.crm_case._get_default_partner_address,
             'email_from': crm.crm_case. _get_default_email,
             'state': 'draft',
             'section_id': crm.crm_case. _get_section,
diff --git a/addons/crm_fundraising/crm_fundraising_demo.xml b/addons/crm_fundraising/crm_fundraising_demo.xml
index c7588701af0..52b4094d126 100644
--- a/addons/crm_fundraising/crm_fundraising_demo.xml
+++ b/addons/crm_fundraising/crm_fundraising_demo.xml
@@ -3,7 +3,6 @@
     <data noupdate="1">
         <record id="crm_case_helpingstreetchildren0" model="crm.fundraising">
             <field eval="50" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
             <field name="type_id" ref="type_fund3"/>
             <field eval="3.0" name="duration"/>
@@ -22,7 +21,6 @@
     <data noupdate="1">
         <record id="crm_case_helpingearthquakevictims0" model="crm.fundraising">
             <field eval="80" name="probability"/>
-            <field name="partner_address_id" ref="base.main_address"/>
             <field eval="1" name="active"/>
             <field name="type_id" ref="type_fund4"/>
             <field name="partner_id" ref="base.main_partner"/>
@@ -39,7 +37,6 @@
     </data>
     <data noupdate="1">
         <record id="crm_case_donatingbookstoschoollibraries0" model="crm.fundraising">
-            <field name="partner_address_id" ref="base.res_partner_address_zen"/>
             <field eval="1" name="active"/>
             <field name="type_id" ref="type_fund1"/>
             <field eval="5.0" name="duration"/>
@@ -56,7 +53,6 @@
     </data>
     <data noupdate="1">
         <record id="crm_case_renovatinggovernmentschools0" model="crm.fundraising">
-            <field name="partner_address_id" ref="base.res_partner_address_7"/>
             <field eval="1" name="active"/>
             <field name="type_id" ref="type_fund2"/>
             <field eval="3.0" name="duration"/>
@@ -74,7 +70,6 @@
     </data>
     <data noupdate="1">
         <record id="crm_case_donatingambulancestohospitals0" model="crm.fundraising">
-            <field name="partner_address_id" ref="base.res_partner_address_13"/>
             <field eval="1" name="active"/>
             <field name="type_id" ref="type_fund4"/>
             <field name="partner_id" ref="base.res_partner_14"/>
@@ -91,7 +86,6 @@
     </data>
     <data noupdate="1">
         <record id="crm_case_donatinghospitalequipments0" model="crm.fundraising">
-            <field name="partner_address_id" ref="base.res_partner_address_2"/>
             <field eval="1" name="active"/>
             <field name="type_id" ref="type_fund3"/>
             <field name="partner_id" ref="base.res_partner_10"/>
@@ -109,7 +103,6 @@
     </data>
     <data noupdate="1">
         <record id="crm_case_encouragingarts0" model="crm.fundraising">
-            <field name="partner_address_id" ref="base.res_partner_address_14"/>
             <field eval="1" name="active"/>
             <field name="type_id" ref="type_fund2"/>
             <field eval="7.0" name="duration"/>
@@ -127,7 +120,6 @@
     <data noupdate="1">
         <record id="crm_case_promotingculturalprogramsandpreservingdyingartforms0" model="crm.fundraising">
             <field eval="10" name="probability"/>
-            <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
             <field name="type_id" ref="type_fund1"/>
             <field eval="6.0" name="duration"/>
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index f693cd3a8dc..ba44c456028 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -13,7 +13,7 @@
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
-        <field name="context">{"search_default_user_id":uid,"search_default_current":1, 'search_default_section_id': section_id}</field>
+        <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
         <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
         <field name="help">If you need to collect money for your organization or a campaign, Fund Raising allows you to track all your fund raising activities. In the search list, filter by funds description, email, history and probability of success.</field>
     </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index cc58b793c17..012f06ea14c 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -4,7 +4,7 @@
            <!-- Fund Raising Configuration Menu -->
         <menuitem id="menu_config_fundrising" name="Fund Raising"
             groups="base.group_extended"
-            parent="base.menu_base_config" sequence="8" />
+            parent="base.menu_base_config" sequence="65" />
 
         <!-- Fund Raising Categories Form View -->
 
@@ -19,7 +19,7 @@
         </record>
 
         <menuitem action="crm_fund_categ_action" name="Categories"
-            id="menu_crm_case_fundraising-act" groups="base.group_extended"
+            id="menu_crm_case_fundraising-act" groups="base.group_no_one"
             parent="menu_config_fundrising" />
 
         <!-- Fund Stage Form View -->
@@ -94,10 +94,6 @@
                                 <field name="partner_id" select="1"
                                     on_change="onchange_partner_id(partner_id, email_from)"
                                     colspan="2" />
-                                <field name="partner_address_id"
-                                    string="Contact"
-                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                    colspan="1" />
                                 <field name="email_from" colspan="2"/>
                             </group>
                             <group colspan="2" col="2">
@@ -162,7 +158,7 @@
                                 <field name="id" select="1"/>
                                 <field name="priority" string="Priority"/>
                             </group>
-                            <group col="2" colspan="2">
+                            <group col="2" colspan="2" groups="base.group_no_one">
                                 <separator colspan="4" string="Dates"/>
                                 <field name="create_date"/>
                                 <field name="date_closed"/>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 19334f2fe4c..46f989629d2 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -191,7 +191,7 @@
         <menuitem name="Fundraising Analysis"
             action="action_report_crm_fundraising"
             groups="base.group_extended"
-            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
+            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 97ed007f456..7717ae2ce21 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -58,8 +58,6 @@ class crm_helpdesk(crm.crm_case, osv.osv):
             'company_id': fields.many2one('res.company', 'Company'),
             'date_closed': fields.datetime('Closed', readonly=True),
             'partner_id': fields.many2one('res.partner', 'Partner'),
-            'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"),
             'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
             'email_from': fields.char('Email', size=128, help="These people will receive email."),
             'date': fields.datetime('Date'),
@@ -86,7 +84,6 @@ class crm_helpdesk(crm.crm_case, osv.osv):
         'active': lambda *a: 1,
         'user_id': crm.crm_case._get_default_user,
         'partner_id': crm.crm_case._get_default_partner,
-        'partner_address_id': crm.crm_case._get_default_partner_address,
         'email_from': crm.crm_case. _get_default_email,
         'state': lambda *a: 'draft',
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml
index a7f36c931c9..c91205fa7e6 100644
--- a/addons/crm_helpdesk/crm_helpdesk_demo.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml
@@ -38,7 +38,6 @@
         </record>
 
         <record id="crm_helpdesk_howtocreateanewmodule0" model="crm.helpdesk">
-            <field name="partner_address_id" ref="base.res_partner_address_9"/>
             <field eval="1" name="active"/>
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 31ee27345b0..96d862f1603 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <menuitem id="base.menu_aftersale" name="After-Sale Services"
-            parent="base.menu_base_partner" sequence="7" />
+        <menuitem
+            icon="terp-project" id="base.menu_main_pm"
+            name="Project" sequence="10"
+            web_icon="images/project.png"
+            web_icon_hover="images/project-hover.png"/>
+
+        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
 
 <!-- Help Desk (menu) -->
 
@@ -12,7 +17,7 @@
             <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
             <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
-            <field name="context">{"search_default_user_id":uid, "search_default_current":1, 'search_default_section_id': section_id}</field>
+            <field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
             <field name="help">Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer.</field>
         </record>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 3d48a3b88ac..5f2fee07ff1 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -4,7 +4,7 @@
        <!-- Helpdesk Support Categories Configuration Menu-->
        <menuitem id="menu_config_helpdesk" name="Helpdesk"
         groups="base.group_extended"
-        parent="base.menu_base_config" sequence="7" />
+        parent="base.menu_base_config" sequence="60" />
 
         <!-- Helpdesk Support Categories Form View -->
 
@@ -19,7 +19,7 @@
         </record>
 
         <menuitem action="crm_helpdesk_categ_action" name="Categories"
-            id="menu_crm_case_helpdesk-act" parent="menu_config_helpdesk" />
+            id="menu_crm_case_helpdesk-act" parent="menu_config_helpdesk" groups="base.group_no_one"/>
 
         <!--  Helpdesk Support Form View -->
 
@@ -47,9 +47,6 @@
                                 <field name="partner_id" colspan="2"
                                     on_change="onchange_partner_id(partner_id, email_from)"
                                     select="1" />
-                                <field name="partner_address_id" colspan="2"
-                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                />
                                 <newline/>
                                 <field name="email_from" colspan="2"/>
                                 <button name="remind_partner"
@@ -116,7 +113,7 @@
                                 icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_no_one">
                                 <separator colspan="4" string="Dates"/>
                                 <field name="create_date"/>
                                 <field name="write_date"/>
@@ -206,7 +203,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
-                    <filter icon="terp-check" string="New" 
+                    <filter icon="terp-check" string="New"
                         name="current"
                         domain="[('state','=','draft')]"
                         help="New Helpdesk Request" />
@@ -226,7 +223,7 @@
                         help="Todays's Helpdesk Requests"
                         />
                     <filter icon="terp-go-week"
-                        string="7 Days" 
+                        string="7 Days"
                         help="Helpdesk requests during last 7 days"
                         domain="[('date','&lt;',current_date), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                         />
@@ -239,7 +236,7 @@
                             domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My Sales Team(s)" />
                     </field>
-                    <newline/>                         
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
                             domain="[]" help="Partner"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index fd6951b1260..7b5cadf1041 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -156,9 +156,13 @@
             <field name="act_window_id" ref="action_report_crm_helpdesk"/>
         </record>
 
+        <menuitem id="base.menu_project_report" name="Project"
+            groups="base.group_extended"
+            parent="base.menu_reporting" sequence="30"/>
+
         <menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk"
             groups="base.group_extended"
-            id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
+            id="menu_report_crm_helpdesks_tree" parent="base.menu_project_report" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 6f5d0d98dd9..8213e8fa8ef 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -37,7 +37,7 @@ The most appropriate partner can be assigned.
 You can also use the geolocalization without using the GPS coordinates.
     """,
     'author': 'OpenERP SA',
-    'depends': ['crm'],
+    'depends': ['crm', 'account'],
     'demo_xml': [
         'res_partner_demo.xml',
     ],
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index f522cc63d7a..ed918a3d0a1 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -42,7 +42,16 @@ def geo_find(addr):
     if not result:
         return None
     return float(result.group(2)),float(result.group(1))
-    
+
+def geo_query_address(street=None, zip=None, city=None, state=None, country=None):
+    if country and ',' in country and (country.endswith(' of') or country.endswith(' of the')):
+        # put country qualifier in front, otherwise GMap gives wrong results,
+        # e.g. 'Congo, Democratic Republic of the' => 'Democratic Republic of the Congo' 
+        country = '{1} {0}'.format(*country.split(',',1)) 
+    return tools.ustr(', '.join(filter(None, [street, 
+                                              ("%s %s" % (zip or '', city or '')).strip(), 
+                                              state, 
+                                              country])))
 
 class res_partner_grade(osv.osv):
     _order = 'sequence'
@@ -88,16 +97,15 @@ class res_partner(osv.osv):
         'partner_weight': lambda *args: 0
     }
     def geo_localize(self, cr, uid, ids, context=None):
-        for partner in self.browse(cr, uid, ids, context=context):
-            if not partner.address:
+        # Don't pass context to browse()! We need country names in english below
+        for partner in self.browse(cr, uid, ids):
+            if not partner:
                 continue
-            contact = partner.address[0] #TOFIX: should be get latitude and longitude for default contact?
-            addr = ', '.join(filter(None, [
-                    contact.street, 
-                    "%s %s" % (contact.zip , contact.city), 
-                    contact.state_id and contact.state_id.name, 
-                    contact.country_id and contact.country_id.name]))
-            result = geo_find(tools.ustr(addr))
+            result = geo_find(geo_query_address(street=partner.street,
+                                                zip=partner.zip,
+                                                city=partner.city,
+                                                state=partner.state_id.name,
+                                                country=partner.country_id.name))
             if result:
                 self.write(cr, uid, [partner.id], {
                     'partner_latitude': result[0],
@@ -154,18 +162,16 @@ class crm_lead(osv.osv):
             self.write(cr, uid, [lead.id], {'date_assign': fields.date.context_today(self,cr,uid,context=context), 'partner_assigned_id': partner_id}, context=context)
         return res
 
-
     def assign_geo_localize(self, cr, uid, ids, latitude=False, longitude=False, context=None):
-        for lead in self.browse(cr, uid, ids, context=context):
+        # Don't pass context to browse()! We need country name in english below
+        for lead in self.browse(cr, uid, ids):
             if not lead.country_id:
                 continue
-            addr = ', '.join(filter(None, [
-                    lead.street, 
-                    "%s %s" % (lead.zip, lead.city), 
-                    lead.state_id and lead.state_id.name or '', 
-                    lead.country_id and lead.country_id.name or ''
-            ]))
-            result = geo_find(tools.ustr(addr))
+            result = geo_find(geo_query_address(street=lead.street,
+                                                zip=lead.zip,
+                                                city=lead.city,
+                                                state=lead.state_id.name,
+                                                country=lead.country_id.name))
             if not latitude and result:
                 latitude = result[0]
             if not longitude and result:
@@ -175,7 +181,7 @@ class crm_lead(osv.osv):
                 'partner_longitude': longitude
             }, context=context)
         return True
-        
+
     def search_geo_partner(self, cr, uid, ids, context=None):
         res_partner = self.pool.get('res.partner')
         res_partner_ids = {}
@@ -192,7 +198,7 @@ class crm_lead(osv.osv):
                     ('partner_weight', '>', 0),
                     ('partner_latitude', '>', latitude - 2), ('partner_latitude', '<', latitude + 2),
                     ('partner_longitude', '>', longitude - 1.5), ('partner_longitude', '<', longitude + 1.5),
-                    ('country', '=', lead.country_id.id),
+                    ('country_id', '=', lead.country_id.id),
                 ], context=context)
 
                 # 2. second way: in the same country, big area
@@ -201,16 +207,24 @@ class crm_lead(osv.osv):
                         ('partner_weight', '>', 0),
                         ('partner_latitude', '>', latitude - 4), ('partner_latitude', '<', latitude + 4),
                         ('partner_longitude', '>', longitude - 3), ('partner_longitude', '<' , longitude + 3),
-                        ('country', '=', lead.country_id.id),
+                        ('country_id', '=', lead.country_id.id),
                     ], context=context)
 
+                # 3. third way: in the same country, extra large area
+                if not partner_ids:
+                    partner_ids = res_partner.search(cr, uid, [
+                        ('partner_weight','>', 0),
+                        ('partner_latitude','>', latitude - 8), ('partner_latitude','<', latitude + 8),
+                        ('partner_longitude','>', longitude - 8), ('partner_longitude','<', longitude + 8),
+                        ('country', '=', lead.country_id.id),
+                    ], context=context)
 
                 # 5. fifth way: anywhere in same country
                 if not partner_ids:
                     # still haven't found any, let's take all partners in the country!
                     partner_ids = res_partner.search(cr, uid, [
                         ('partner_weight', '>', 0),
-                        ('country', '=', lead.country_id.id),
+                        ('country_id', '=', lead.country_id.id),
                     ], context=context)
 
                 # 6. sixth way: closest partner whatsoever, just to have at least one result
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index a0bbd62c131..9f6546aee4a 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -12,7 +12,7 @@
                     <group>
                         <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
                             domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days" 
+                        <filter icon="terp-go-week" string="7 Days"
                             domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
@@ -152,17 +152,17 @@
             <field name="view_id" ref="view_report_crm_opportunity_assign_tree"/>
             <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
        </record>
-       
+
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_assign_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_report_crm_lead_assign_graph"/>
             <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
-       </record>       
+       </record>
 
        <menuitem id="menu_report_crm_opportunities_assign_tree"
            groups="base.group_extended"
-           parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="5"/>
+           parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/report/crm_partner_report.py b/addons/crm_partner_assign/report/crm_partner_report.py
index c225e35f581..7dccab30da2 100644
--- a/addons/crm_partner_assign/report/crm_partner_report.py
+++ b/addons/crm_partner_assign/report/crm_partner_report.py
@@ -51,7 +51,7 @@ class crm_partner_report_assign(osv.osv):
                 SELECT
                     coalesce(i.id, p.id - 1000000000) as id,
                     p.id as partner_id,
-                    (SELECT country_id FROM res_partner_address a WHERE a.partner_id=p.id AND country_id is not null limit 1) as country_id,
+                    (SELECT country_id FROM res_partner a WHERE a.parent_id=p.id AND country_id is not null limit 1) as country_id,
                     p.grade_id,
                     p.activation,
                     p.date_review,
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index 528233fc183..e7581f5bab5 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -77,7 +77,7 @@
 
        <menuitem id="menu_report_crm_partner_assign_tree"
            groups="base.group_extended"
-           parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="5"/>
+           parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="25"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index f9d9d946ead..4bd768179a3 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -33,7 +33,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="res_partner_activation_config_mi" parent="base.menu_config_address_book" action="res_partner_activation_act"/>
+        <menuitem id="res_partner_activation_config_mi" parent="base.menu_config_address_book" action="res_partner_activation_act" groups="base.group_no_one"/>
 
     <!--Partner Grade -->
 
@@ -69,7 +69,7 @@
         <field name="view_type">form</field>
     </record>
     <menuitem action="res_partner_grade_action" id="menu_res_partner_grade_action"
-        groups="base.group_extended"
+        groups="base.group_no_one"
         parent="base.menu_crm_config_lead" />
 
     <!-- Partner form -->
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 565f99b9db1..e9edca8166d 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -37,7 +37,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         'user_id': fields.many2one('res.users', "User"),
         'attachment_ids': fields.many2many('ir.attachment','lead_forward_to_partner_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
         'partner_id' : fields.many2one('res.partner', 'Partner'),
-        'address_id' : fields.many2one('res.partner.address', 'Address'),
         'history': fields.selection([('info', 'Case Information'), ('latest', 'Latest email'), ('whole', 'Whole Story')], 'Send history', required=True),
     }
 
@@ -75,27 +74,15 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         """This function fills address information based on partner/user selected
         """
         if not partner_id:
-            return {'value' : {'email_to' : False, 'address_id': False}}
-
+            return {'value' : {'email_to' : False}}
         partner_obj = self.pool.get('res.partner')
-        addr = partner_obj.address_get(cr, uid, [partner_id], ['contact'])
-        data = {'address_id': addr['contact']}
-        data.update(self.on_change_address(cr, uid, ids, addr['contact'])['value'])
-
+        data = {}
         partner = partner_obj.browse(cr, uid, [partner_id])
         user_id = partner and partner[0].user_id or False
-        email = user_id and user_id.user_email or ''
-        data.update({'email_cc' : email, 'user_id': user_id and user_id.id or False})
-        return {
-            'value' : data,
-            'domain' : {'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]"}
-        }
-
-    def on_change_address(self, cr, uid, ids, address_id):
-        email = ''
-        if address_id:
-            email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
-        return {'value': {'email_to' : email}}
+        data.update({'email_from': partner and partner[0].email or "", 
+                     'email_cc' : user_id and user_id.user_email or '', 
+                     'user_id': user_id and user_id.id or False})
+        return {'value' : data}
 
     def action_forward(self, cr, uid, ids, context=None):
         """
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 645c729b164..7f20d5b4b15 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -20,7 +20,6 @@
                         </group>
                         <group col="4" colspan="4" attrs="{'invisible' : [('send_to','!=','partner')]}">
                             <field name="partner_id" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2" />
-                            <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="2" />
                         </group>
                     </group>
                     <separator string="" colspan="4" />
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index a54d3d4b0a9..9330f20ee0c 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -10,8 +10,8 @@
           <field name="help">You can create specific topic-related questionnaires to guide your team(s) in the sales cycle by helping them to ask the right questions. The segmentation tool allows you to automatically assign a partner to a category according to his answers to the different questionnaires.</field>
         </record>
 
-        <menuitem parent="base.menu_crm_config_lead" id="menu_segm_questionnaire"
-                  action="open_questionnaires" />
+        <menuitem parent="base.menu_base_config" id="menu_segm_questionnaire"
+                  action="open_questionnaires" sequence="1"/>
 
         <record model="ir.actions.act_window" id="open_questions">
           <field name="name">Questions</field>
@@ -20,8 +20,8 @@
           <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem parent="base.menu_crm_config_lead" id="menu_segm_answer"
-                  action="open_questions" />
+        <menuitem parent="base.menu_base_config" id="menu_segm_answer"
+                  action="open_questions" sequence="37" groups="base.group_no_one"/>
 
 <!-- Profiling Questionnaire Tree view  -->
 
diff --git a/addons/crm_profiling/test/process/profiling.yml b/addons/crm_profiling/test/process/profiling.yml
index 99fe2da1733..aa3060add3c 100644
--- a/addons/crm_profiling/test/process/profiling.yml
+++ b/addons/crm_profiling/test/process/profiling.yml
@@ -22,13 +22,12 @@
   I'm creating new partner "John" with his email "info@mycustomer.com".
 -
   !record {model: res.partner, id: res_partner_john0}:
-    address:
-      - city: Bruxelles
-        country_id: base.be
-        street: Rue des Palais 51, bte 33
-        type: default
-        zip: '1000'
-        email: 'info@mycustomer.com'
+    city: Bruxelles
+    country_id: base.be
+    street: Rue des Palais 51, bte 33
+    type: default
+    zip: '1000'
+    email: 'info@mycustomer.com'
     name: John
     category_id:
       - res_partner_category_customers0
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index c098f908b8a..a587463fedb 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -57,7 +57,8 @@
     <menuitem
         id="menu_crm_todo"
         parent="base.menu_sales"
-        action="crm_todo_action"/>
+        action="crm_todo_action"
+        sequence="5"/>
 
 
     </data>
diff --git a/addons/crm_todo/i18n/fi.po b/addons/crm_todo/i18n/fi.po
new file mode 100644
index 00000000000..10a17f7f87f
--- /dev/null
+++ b/addons/crm_todo/i18n/fi.po
@@ -0,0 +1,96 @@
+# Finnish 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-03-26 09:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-27 04:51+0000\n"
+"X-Generator: Launchpad (build 15011)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Tehtävä"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Aikaikkuna"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "Peruuttaaksesi tehtävän"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Virhe! Tehtävän lopetuspäivän tulee olla myöhäisempi kuin aloituspäivä"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "seuraava"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "Omat tehtävät"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Lisätiedot"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Liidi / mahdollisuus"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "Vaihtaaksesi valmis tilaan"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "edellinen"
diff --git a/addons/crm_todo/i18n/it.po b/addons/crm_todo/i18n/it.po
new file mode 100644
index 00000000000..00c702f72f6
--- /dev/null
+++ b/addons/crm_todo/i18n/it.po
@@ -0,0 +1,97 @@
+# Italian 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-03-23 08:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-24 04:54+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Attività"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Periodo Inderogabile"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr ""
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Errore ! La data di termine del compito deve essere antecedente a quella di "
+"inizio"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Successivo"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "Le Mie Attività"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Attività"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Completato"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Errore ! Non è possibile creare attività ricorsive."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Cancella"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Altre Informazioni"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Precedente"
diff --git a/addons/decimal_precision/i18n/ja.po b/addons/decimal_precision/i18n/ja.po
new file mode 100644
index 00000000000..43e0b4f18ed
--- /dev/null
+++ b/addons/decimal_precision/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-01 06:02+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-02 04:37+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "桁数"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy"
+msgstr "十進数の精度"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "使い方"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "それぞれの使い方には一つの値だけ定義できます！"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "十進数の精度"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "十進数．精度"
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 77193cde2bf..75eb766f011 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -80,7 +80,7 @@ class delivery_carrier(osv.osv):
     }
 
     def grid_get(self, cr, uid, ids, contact_id, context=None):
-        contact = self.pool.get('res.partner.address').browse(cr, uid, contact_id, context=context)
+        contact = self.pool.get('res.partner').browse(cr, uid, contact_id, context=context)
         for carrier in self.browse(cr, uid, ids, context=context):
             for grid in carrier.grids_id:
                 get_id = lambda x: x.id
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 427f943890b..a5db7ff042c 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -7,11 +7,6 @@
         <record id="delivery_partner" model="res.partner">
             <field name="name">The Poste</field>
         </record>
-        <record id="delivery_partner_address" model="res.partner.address">
-            <field name="type">default</field>
-            <field name="partner_id" ref="delivery_partner"/>
-        </record>
-
         <!-- Create a service product -->
 
         <record id="delivery_product" model="product.product">
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5d6d9cd2d40..9f3d1516ede 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -1,7 +1,7 @@
 <openerp>
     <data>
         <!-- Delivery Carriers -->
-        <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_configuration" sequence="4"/>
+        <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_configuration" groups="base.group_no_one" sequence="50"/>
 
         <record id="view_delivery_carrier_tree" model="ir.ui.view">
             <field name="name">delivery.carrier.tree</field>
@@ -72,16 +72,7 @@
             <field name="help">Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders</field>
         </record>
 
-        <record id="action_delivery_carrier_form1" model="ir.actions.act_window">
-            <field name="name">Define Delivery Methods</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">delivery.carrier</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help">Define your delivery methods and their pricing. The delivery costs can be added on the sale order form or in the invoice, based on the delivery orders.</field>
-        </record>
-
-        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery"/>
+        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="stock.menu_stock_configuration" sequence="15"/>
 
         <!-- Delivery Grids -->
         <record id="view_delivery_grid_tree" model="ir.ui.view">
@@ -131,7 +122,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help">The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range.</field>
         </record>
-        <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery" groups="base.group_extended"/>
+        <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
 
         <record id="view_delivery_grid_line_form" model="ir.ui.view">
             <field name="name">delivery.grid.line.form</field>
@@ -189,7 +180,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <field name="address_id" position="after">
+                <field name="partner_id" position="after">
                     <field name="carrier_id"/>
                     <field name="carrier_tracking_ref" groups="base.group_extended"/>
                     <field name="number_of_packages" groups="base.group_extended"/>
@@ -331,11 +322,5 @@
             </field>
         </record>
 
-       <record id="delivery_method_form_view_todo" model="ir.actions.todo">
-           <field name="action_id" ref="action_delivery_carrier_form1"/>
-           <field name="category_id" ref="stock.category_stock_management_config" />
-           <field name="sequence">10</field>
-       </record>
-
     </data>
 </openerp>
diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 3709c465e66..5a3750e64a8 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -125,7 +125,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    
+
     <blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
       <tr>
         <td>
@@ -134,8 +134,8 @@
           <para style="terp_default_9">[[ o.sale_id and o.sale_id.partner_invoice_id and display_address(o.sale_id.partner_invoice_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.address_id and o.address_id.partner_id and o.address_id.partner_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ o.address_id and o.address_id and display_address(o.address_id) ]]</para>
+          <para style="terp_default_9">[[ o.partner_id and o.partner_id and o.partner_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_id and o.partner_id and display_address(o.partner_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 6a7dcac91d4..b441a8e5efe 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -50,7 +50,7 @@ class stock_picking(osv.osv):
         for line in self.pool.get('stock.move').browse(cr, uid, ids, context=context):
             result[line.picking_id.id] = True
         return result.keys()
-    
+
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier","Carrier"),
         'volume': fields.float('Volume'),
@@ -84,7 +84,7 @@ class stock_picking(osv.osv):
                 for inv_line in invoice.invoice_line):
             return None
         grid_id = carrier_obj.grid_get(cr, uid, [picking.carrier_id.id],
-                picking.address_id.id, context=context)
+                picking.partner_id.id, context=context)
         if not grid_id:
             raise osv.except_osv(_('Warning'),
                     _('The carrier %s (id: %d) has no delivery grid!') \
@@ -99,7 +99,7 @@ class stock_picking(osv.osv):
                     .property_account_income_categ.id
 
         taxes = picking.carrier_id.product_id.taxes_id
-        partner = picking.address_id.partner_id or False
+        partner = picking.partner_id or False
         if partner:
             account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
             taxes_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, partner.property_account_position, taxes)
@@ -121,7 +121,7 @@ class stock_picking(osv.osv):
             group=False, type='out_invoice', context=None):
         invoice_obj = self.pool.get('account.invoice')
         picking_obj = self.pool.get('stock.picking')
-        invoice_line_obj = self.pool.get('account.invoice.line') 
+        invoice_line_obj = self.pool.get('account.invoice.line')
         result = super(stock_picking, self).action_invoice_create(cr, uid,
                 ids, journal_id=journal_id, group=group, type=type,
                 context=context)
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index e3b1b4c9c64..4412423c97b 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -35,10 +35,10 @@
 
         <menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
          <menuitem
-            name="Dashboard"
+            name="Knowledge"
             id="menu_reports_document"
-            parent="menu_reporting"
-            sequence="0"
+            parent="base.menu_reporting_dashboard"
+            sequence="45"
             groups="base.group_system"/>
 
 
diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml
index 894e5bac77f..45c4b337d99 100644
--- a/addons/document/custom_view.xml
+++ b/addons/document/custom_view.xml
@@ -2,9 +2,11 @@
 <data>
     <record model="res.groups" id="group_compta_user">
         <field name="name">grcompta</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     <record model="res.groups" id="group_compta_admin">
         <field name="name">grcomptaadmin</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     <menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/>
 </data>
diff --git a/addons/document/document.py b/addons/document/document.py
index 9ea7f97a321..92ece063a47 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -311,9 +311,6 @@ class document_file(osv.osv):
         elif 'partner_id' in obj_model._columns and obj_model._columns['partner_id']._obj == 'res.partner':
             bro = obj_model.browse(cr, uid, res_id, context=context)
             return bro.partner_id.id
-        elif 'address_id' in obj_model._columns and obj_model._columns['address_id']._obj == 'res.partner.address':
-            bro = obj_model.browse(cr, uid, res_id, context=context)
-            return bro.address_id.partner_id.id
         return False
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index a68f676a295..e426444f26d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -264,12 +264,12 @@
                         <separator string="Related to" colspan="2"/>
                             <field name="partner_id"/>
                     </group>
-                    <group col="2" colspan="2" groups="base.group_extended">
+                    <group col="2" colspan="2" groups="base.group_no_one">
                         <separator string="Created" colspan="2"/>
                         <field name="create_uid" readonly="1"/>
                         <field name="create_date" readonly="1"/>
                     </group>
-                    <group col="2" colspan="2" groups="base.group_extended">
+                    <group col="2" colspan="2" groups="base.group_no_one">
                         <separator string="Modified" colspan="2"/>
                         <field name="write_uid" readonly="1"/>
                         <field name="write_date" readonly="1"/>
@@ -335,8 +335,8 @@
                 <field name="parent_id" />
                 <field name="user_id"/>
                 <field name="company_id"/>
-                <field name="create_date"/>
-                <field name="write_date"/>
+                <field name="create_date" groups="base.group_no_one"/>
+                <field name="write_date" groups="base.group_no_one"/>
                 <field name="partner_id" groups="base.group_extended" />
                 <field name="type"  groups="base.group_extended"/>
             </tree>
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 9fba954aa0e..cacde50c36e 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -5,6 +5,7 @@
     <record id="base.group_document_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_knowledge_management"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 <!--    <record id="group_document_manager" model="res.groups">-->
diff --git a/addons/edi/models/res_company.py b/addons/edi/models/res_company.py
index cf5efe997e0..0ab6607cdad 100644
--- a/addons/edi/models/res_company.py
+++ b/addons/edi/models/res_company.py
@@ -37,13 +37,12 @@ class res_company(osv.osv):
                     an empty dict if no address can be found
         """
         res_partner = self.pool.get('res.partner')
-        res_partner_address = self.pool.get('res.partner.address')
         addresses = res_partner.address_get(cr, uid, [company.partner_id.id], ['default', 'contact', 'invoice'])
         addr_id = addresses['invoice'] or addresses['contact'] or addresses['default']
         result = {}
         if addr_id:
-            address = res_partner_address.browse(cr, uid, addr_id, context=context)
-            result = res_partner_address.edi_export(cr, uid, [address], edi_struct=edi_address_struct, context=context)[0]
+            address = res_partner.browse(cr, uid, addr_id, context=context)
+            result = res_partner.edi_export(cr, uid, [address], edi_struct=edi_address_struct, context=context)[0]
         if company.logo:
             result['logo'] = company.logo # already base64-encoded
         if company.paypal_account:
@@ -52,7 +51,7 @@ class res_company(osv.osv):
         res_partner_bank = self.pool.get('res.partner.bank')
         bank_ids = res_partner_bank.search(cr, uid, [('company_id','=',company.id),('footer','=',True)], context=context)
         if bank_ids:
-            result['bank_ids'] = res_partner_address.edi_m2m(cr, uid,
+            result['bank_ids'] = res_partner.edi_m2m(cr, uid,
                                                              res_partner_bank.browse(cr, uid, bank_ids, context=context),
                                                              context=context)
         return result
diff --git a/addons/edi/models/res_partner.py b/addons/edi/models/res_partner.py
index 7c40a5c7354..357fdec061b 100644
--- a/addons/edi/models/res_partner.py
+++ b/addons/edi/models/res_partner.py
@@ -20,13 +20,16 @@
 ##############################################################################
 import logging
 
-from osv import fields,osv 
+from osv import fields,osv
 from edi import EDIMixin
 from openerp import SUPERUSER_ID
 from tools.translate import _
 
-RES_PARTNER_ADDRESS_EDI_STRUCT = {
+RES_PARTNER_EDI_STRUCT = {
     'name': True,
+    'ref': True,
+    'lang': True,
+    'website': True,
     'email': True,
     'street': True,
     'street2': True,
@@ -39,14 +42,6 @@ RES_PARTNER_ADDRESS_EDI_STRUCT = {
     'mobile': True,
 }
 
-RES_PARTNER_EDI_STRUCT = {
-    'name': True,
-    'ref': True,
-    'lang': True,
-    'website': True,
-    'address': RES_PARTNER_ADDRESS_EDI_STRUCT
-}
-
 class res_partner(osv.osv, EDIMixin):
     _inherit = "res.partner"
 
@@ -55,9 +50,6 @@ class res_partner(osv.osv, EDIMixin):
                                                   edi_struct or dict(RES_PARTNER_EDI_STRUCT),
                                                   context=context)
 
-class res_partner_address(osv.osv, EDIMixin):
-    _inherit = "res.partner.address"
-
     def _get_bank_type(self, cr, uid, context=None):
         # first option: the "normal" bank type, installed by default
         res_partner_bank_type = self.pool.get('res.partner.bank.type')
@@ -65,7 +57,6 @@ class res_partner_address(osv.osv, EDIMixin):
             return self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'bank_normal', context=context).code
         except ValueError:
             pass
-
         # second option: create a new custom type for EDI or use it if already created, as IBAN type is
         # not always appropriate: we need a free-form bank type for max flexibility (users can correct
         # data manually after import)
@@ -78,19 +69,14 @@ class res_partner_address(osv.osv, EDIMixin):
                                                                  'code': label})
         return code
 
-    def edi_export(self, cr, uid, records, edi_struct=None, context=None):
-        return super(res_partner_address,self).edi_export(cr, uid, records,
-                                                          edi_struct or dict(RES_PARTNER_ADDRESS_EDI_STRUCT),
-                                                          context=context)
-
     def edi_import(self, cr, uid, edi_document, context=None):
         # handle bank info, if any
         edi_bank_ids = edi_document.pop('bank_ids', None)
-        address_id = super(res_partner_address,self).edi_import(cr, uid, edi_document, context=context)
+        contact_id = super(res_partner,self).edi_import(cr, uid, edi_document, context=context)
         if edi_bank_ids:
-            address = self.browse(cr, uid, address_id, context=context)
+            contact = self.browse(cr, uid, contact_id, context=context)
             import_ctx = dict((context or {}),
-                              default_partner_id=address.partner_id.id,
+                              default_partner_id = contact.id,
                               default_state=self._get_bank_type(cr, uid, context))
             for ext_bank_id, bank_name in edi_bank_ids:
                 try:
@@ -101,5 +87,7 @@ class res_partner_address(osv.osv, EDIMixin):
                     logging.getLogger('edi.res_partner').warning('Failed to import bank account using'
                                                                  'bank type: %s, ignoring', import_ctx['default_state'],
                                                                  exc_info=True)
-        return address_id
+        return contact_id
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/static/src/css/edi.css b/addons/edi/static/src/css/edi.css
index 478985ee585..1601151ae1f 100644
--- a/addons/edi/static/src/css/edi.css
+++ b/addons/edi/static/src/css/edi.css
@@ -146,6 +146,14 @@ table.oe_edi_data, .oe_edi_doc_title {
     font-style: italic;
     font-size: 95%;
     padding-left: 10px;
+
+    /* prevent wide notes from disrupting layout due to <pre> styling */
+    white-space: pre-line;
+    width: 90%;
+}
+.oe_edi_data_row .oe_edi_inner_note {
+    /* prevent wide notes from disrupting layout due to <pre> styling */
+    width: 25em;
 }
 .oe_edi_shade {
     background: #e8e8e8;
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index a93086bdcaa..995012cb3c5 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -108,7 +108,7 @@ openerp.edi.EdiView = openerp.web.OldWidget.extend({
 });
 
 openerp.edi.edi_view = function (db, token) {
-    openerp.connection.bind().then(function () {
+    openerp.connection.session_bind().then(function () {
         new openerp.edi.EdiView(null,db,token).appendTo($("body").addClass('openerp'));
     });
 }
@@ -188,7 +188,7 @@ openerp.edi.EdiImport = openerp.web.OldWidget.extend({
 });
 
 openerp.edi.edi_import = function (url) {
-    openerp.connection.bind().then(function () {
+    openerp.connection.session_bind().then(function () {
         new openerp.edi.EdiImport(null,url).appendTo($("body").addClass('openerp'));
     });
 }
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
index 1f27c49ccdd..b9b385e9a07 100644
--- a/addons/edi/static/src/xml/edi.xml
+++ b/addons/edi/static/src/xml/edi.xml
@@ -11,7 +11,7 @@
         <td colspan="2" valign="top" id="oe_header" class="header">
             <div> <a href="/" class="company_logo_link">
                     <div class="company_logo"
-                         t-att-style="'background: url('+ (doc.company_address ? '/edi/binary?db='+widget.db+'&amp;token='+widget.token : '/web/static/src/img/logo.png')+')'"/></a> </div>
+                         t-att-style="'background-size: 180px 46px; background: url('+ (doc.company_address ? '/edi/binary?db='+widget.db+'&amp;token='+widget.token : '/web/static/src/img/logo.png')+')'"/></a> </div>
         </td>
     </tr>
     <tr>
diff --git a/addons/edi/static/src/xml/edi_account.xml b/addons/edi/static/src/xml/edi_account.xml
index dc6fb7f9754..3ce1daebf93 100644
--- a/addons/edi/static/src/xml/edi_account.xml
+++ b/addons/edi/static/src/xml/edi_account.xml
@@ -39,9 +39,9 @@
                 <th align="left">Your Reference</th>
             </tr>
             <tr class="oe_edi_data_row">
-                <td align="left"><t t-esc="doc.name"/></td>
-                <td align="left"><t t-esc="doc.date_invoice"/></td>
-                <td align="left"><t t-esc="doc.partner_ref"/></td>
+                <td align="left"><t t-if="doc.name" t-esc="doc.name"/></td>
+                <td align="left"><t t-if="doc.date_invoice" t-esc="doc.date_invoice"/></td>
+                <td align="left"><t t-if="doc.partner_ref" t-esc="doc.partner_ref"/></td>
             </tr>
         </table>
         <p/>
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 6c1571c5630..86f136ca5b9 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -57,6 +57,8 @@ class email_template(osv.osv):
            :param int res_id: id of the document record this mail is related to.
         """
         if not template: return u""
+        if context is None:
+            context = {}
         try:
             template = tools.ustr(template)
             record = None
@@ -145,7 +147,7 @@ class email_template(osv.osv):
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
                                                "priority one will be used."),
         'body_text': fields.text('Text contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
-        'body_html': fields.text('Rich-text contents', help="Rich-text/HTML version of the message (placeholders may be used here)"),
+        'body_html': fields.text('Rich-text contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
         'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
                                                                "Please note that this overrides the 'Resource Tracking' option, "
                                                                "so if you simply need to track replies to outgoing emails, enable "
@@ -338,7 +340,7 @@ class email_template(osv.osv):
         attachments = {}
         # Add report as a Document
         if template.report_template:
-            report_name = template.report_name
+            report_name = self.render_template(cr, uid, template.report_name, template.model, res_id, context=context)
             report_service = 'report.' + report_xml_pool.browse(cr, uid, template.report_template.id, context).report_name
             # Ensure report is rendered using template's language
             ctx = context.copy()
@@ -374,6 +376,7 @@ class email_template(osv.osv):
                 was executed for this message only.
            :returns: id of the mail.message that was created 
         """
+        if context is None: context = {}
         mail_message = self.pool.get('mail.message')
         ir_attachment = self.pool.get('ir.attachment')
         values = self.generate_email(cr, uid, template_id, res_id, context=context)
@@ -390,9 +393,10 @@ class email_template(osv.osv):
                     'res_model': mail_message._name,
                     'res_id': msg_id,
             }
-            if context.has_key('default_type'):
-                del context['default_type']
+            context.pop('default_type', None)
             attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))
+        if attachment_ids:
+            mail_message.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
         if force_send:
             mail_message.send(cr, uid, [msg_id], context=context)
         return msg_id
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index ef4572429a1..a4fd749979c 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -95,7 +95,7 @@ class mail_compose_message(osv.osv_memory):
                     for fname, fcontent in attachment.iteritems():
                         data_attach = {
                             'name': fname,
-                            'datas': base64.b64encode(fcontent),
+                            'datas': fcontent,
                             'datas_fname': fname,
                             'description': fname,
                             'res_model' : self._name,
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 06252001c83..ea0e4316ef5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -53,6 +53,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
+    'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 0a4755ab105..96db3db6781 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -62,8 +62,10 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
+        <menuitem id="menus_event_dashboard" name="Events"
+            parent="base.menu_reporting_dashboard" sequence="25"/>
         <menuitem
-            name="Event Dashboard" parent="base.menu_report_association"
+            name="Event Dashboard" parent="menus_event_dashboard"
             action="open_board_associations_manager"
             sequence="1"
             id="menu_board_associations_manager"
diff --git a/addons/event/event.py b/addons/event/event.py
index 133d29281f1..6bf1ea24786 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -148,9 +148,28 @@ class event_event(osv.osv):
                     number = reg_done
                 elif field == 'register_prospect':
                     number = reg_draft
+                elif field == 'register_avail':
+                    #the number of ticket is unlimited if the event.register_max field is not set. 
+                    #In that cas we arbitrary set it to 9999, it is used in the kanban view to special case the display of the 'subscribe' button
+                    number = event.register_max - reg_open if event.register_max != 0 else 9999
                 res[event.id][field] = number
         return res
 
+    def _subscribe_fnc(self, cr, uid, ids, fields, args, context=None):
+        """This functional fields compute if the current user (uid) is already subscribed or not to the event passed in parameter (ids)
+        """
+        register_pool = self.pool.get('event.registration')
+        res = {}
+        for event in self.browse(cr, uid, ids, context=context):
+            res[event.id] = False
+            curr_reg_id = register_pool.search(cr, uid, [('user_id', '=', uid), ('event_id', '=' ,event.id)])
+            if curr_reg_id:
+                for reg in register_pool.browse(cr, uid, curr_reg_id, context=context):
+                    if reg.state in ('open','done'):
+                        res[event.id]= True
+                        continue
+        return res 
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
@@ -158,13 +177,14 @@ class event_event(osv.osv):
         'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
+        'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
         'register_attended': fields.function(_get_register, string='Attended Registrations', multi='register_numbers'), 
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
-            ('draft', 'Draft'),
+            ('draft', 'Unconfirmed'),
             ('confirm', 'Confirmed'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')],
@@ -176,12 +196,13 @@ class event_event(osv.osv):
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'speaker_ids': fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
-        'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
         'country_id': fields.related('address_id', 'country_id',
                     type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
+        'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
     }
 
     _defaults = {
@@ -190,6 +211,22 @@ class event_event(osv.osv):
         'user_id': lambda obj, cr, uid, context: uid,
     }
 
+    def subscribe_to_event(self, cr, uid, ids, context=None):
+        register_pool = self.pool.get('event.registration')
+        user_pool = self.pool.get('res.users')
+        user = user_pool.browse(cr, uid, uid, context=context)
+        curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
+        #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
+        if not curr_reg_ids:
+            curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id,})]
+        return register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)
+
+    def unsubscribe_to_event(self, cr, uid, ids, context=None):
+        register_pool = self.pool.get('event.registration')
+        #the unsubscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to unsubscribe
+        curr_reg_ids = register_pool.search(cr, 1, [('user_id', '=', uid), ('event_id', '=', ids[0])])
+        return register_pool.button_reg_cancel(cr, 1, curr_reg_ids, context=context)
+
     def _check_closing_date(self, cr, uid, ids, context=None):
         for event in self.browse(cr, uid, ids, context=context):
             if event.date_end < event.date_begin:
@@ -217,15 +254,13 @@ class event_registration(osv.osv):
     """Event Registration"""
     _name= 'event.registration'
     _description = __doc__
-    _inherit = ['mail.thread','res.partner.address']
+    _inherit = ['mail.thread','res.partner']
     _columns = {
         'id': fields.integer('ID'),
         'origin': fields.char('Origin', size=124,readonly=True,help="Name of the sale order which create the registration"),
         'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner', states={'done': [('readonly', True)]}),
-        "contact_id": fields.many2one('res.partner.address', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}),
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'date_closed': fields.datetime('Attended Date', readonly=True),
         'date_open': fields.datetime('Registration Date', readonly=True),
@@ -233,19 +268,18 @@ class event_registration(osv.osv):
         'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
         'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
         'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
-        'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'Attendee', states={'done': [('readonly', True)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Unconfirmed'),
                                     ('open', 'Confirmed'),
                                     ('cancel', 'Cancelled'),
                                     ('done', 'Attended')], 'State',
-                                    size=16, readonly=True)
+                                    size=16, readonly=True),
     }
 
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
-        'user_id': lambda self, cr, uid, ctx: uid,
     }
     _order = 'name, create_date desc'
 
@@ -311,7 +345,7 @@ class event_registration(osv.osv):
         data ={}
         if not contact:
             return data
-        addr_obj = self.pool.get('res.partner.address')
+        addr_obj = self.pool.get('res.partner')
         contact_id =  addr_obj.browse(cr, uid, contact, context=context)
         data = {
             'email':contact_id.email,
@@ -350,4 +384,5 @@ class event_registration(osv.osv):
 
 event_registration()
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 0dfbbf6de18..96bc64e12aa 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -32,7 +32,6 @@
         <field name="name">Concert of Bon Jovi</field>
         <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-        <field name="user_id" ref="base.user_root"/>
         <field name="register_max">500</field>
         <field name="type" ref="event_type_1"/>
     </record>
@@ -42,34 +41,44 @@
         <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-05 21:00:00')" name="date_end"/>
         <field name="type" ref="event_type_1"/>
-        <field name="user_id" ref="base.user_root"/>
         <field name="register_min">50</field>
         <field name="register_max">350</field>
     </record>
     <record id="event_2" model="event.event">
-        <field name="name">Conference on ERP Buisness</field>
+        <field name="name">Conference on ERP Business</field>
         <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
-        <field name="user_id" ref="base.user_root"/>
     </record>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
 
 <!-- Demo data for Event Registration-->
     <record id="reg_1_1" model="event.registration">
+        <field name="name">Agrolait</field>
+        <field name="email">s.l@agrolait.be</field>
+        <field name="phone">003281588558</field>
         <field name="event_id" ref="event_1"/>
+        <field name="partner_id" ref="base.res_partner_agrolait"/>
         <field name="nb_register">5</field>
     </record>
 
     <record id="reg_1_2" model="event.registration">
+        <field name="name">ASUStek</field>
+        <field name="email">info@asustek.com</field>
+        <field name="phone">+ 1 64 61 04 01</field>
+        <field name="partner_id" ref="base.res_partner_asus"/>
         <field name="event_id" ref="event_1"/>
         <field name="nb_register">10</field>
     </record>
 
 
     <record id="reg_0_1" model="event.registration">
+        <field name="name">Syleam</field>
+        <field name="email">contact@syleam.fr</field>
+        <field name="phone">+33 (0) 2 33 31 22 10</field>
+        <field name="partner_id" ref="base.res_partner_sednacom"/>
         <field name="event_id" ref="event_0"/>
         <field name="nb_register">6</field>
     </record>
@@ -77,6 +86,9 @@
 
 
     <record id="reg_0_2" model="event.registration">
+        <field name="name">Camptocamp</field>
+        <field name="email">openerp@camptocamp.com</field>
+        <field name="phone">+41 21 619 10 04 </field>
         <field name="event_id" ref="event_2"/>
         <field name="partner_id" ref="base.res_partner_c2c"/>
         <field name="nb_register">5</field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 88be188080e..0825cef42c5 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-       <menuitem  name="Events" id="event_main_menu"/>
+        <menuitem  name="Events" id="event_main_menu"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
     <!-- EVENTS  -->
@@ -41,7 +41,7 @@
             <field name="view_type">form</field>
         </record>
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
@@ -63,7 +63,7 @@
                     <page string="Event">
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1">
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -156,6 +156,71 @@
                 </tree>
             </field>
         </record>
+        
+        <!-- Event Kanban View -->
+	
+	<record model="ir.ui.view" id="view_event_kanban">
+            <field name="name">event.event.kanban</field>
+            <field name="model">event.event</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="register_max"/>
+                    <field name="type"/>
+                    <field name="user_id"/>
+                    <field name="register_current"/>
+                    <field name="is_subscribed"/>
+                    <field name="country_id"/>
+                    <field name="date_begin"/>
+                    <field name="state"/>
+                    <field name="register_avail"/>
+                    <templates>
+                    <t t-name="kanban-box">
+                      <div class="oe_module_vignette">
+                        <a type="edit" class="oe_module_icon">
+                           <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
+                           <div class="oe_event_month_year">
+                             <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
+                             <t t-esc="record.date_begin.raw_value.getFullYear()"/>
+                           </div>
+                           <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
+                        </a>
+                        <div class="oe_module_desc">
+                            <h4><a type="edit"><field name="name"/></a></h4>
+                            <p>
+                              <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
+                              <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
+                              <t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t>
+                              <t t-if="record.register_avail.raw_value == 0"><i>No ticket available.</i></t>
+                              <t t-if="record.register_avail.raw_value != 0">
+                                <i><b><t t-if="record.register_avail.raw_value != 9999"><field name="register_avail"/></t></b></i>
+                                <i>
+                                    <t t-if="record.register_avail.raw_value > 1">tickets </t>
+                                    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">ticket </t>
+                                    available.
+                                </i>
+                              </t>
+                            </p>
+                            <t t-if="record.register_avail.raw_value != 0">
+                              <t t-if="!record.is_subscribed.raw_value">
+                                  <button type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
+                                  <span >Subscribe</span>
+                                  </button>
+                              </t>
+                            </t>
+                            <t t-if="record.is_subscribed.raw_value">
+                              <button type="object" name="unsubscribe_to_event" class="unsubscribe_button oe_event_button_unsubscribe">
+                                <span>Subscribed</span>
+                                <span class="unsubscribe">Unsubscribe</span>
+                              </button>
+                            </t>
+                        </div>
+                      </div>
+                    </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
 
       <!-- Events  Calendar  View -->
 
@@ -199,6 +264,10 @@
                         <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
+                        <filter icon="terp-go-today" string="Upcoming"
+                                name="upcoming"
+                                domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                                help="Upcoming events from today" />
                         <field name="name"/>
                         <field name="type" widget="selection"/>
                         <field name="user_id" widget="selection">
@@ -229,7 +298,8 @@
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
-           <field name="view_mode">calendar,tree,form,graph</field>
+           <field name="view_mode">kanban,calendar,tree,form,graph</field>
+           <field name="context">{"search_default_upcoming":1}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>
@@ -254,7 +324,8 @@
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
 
-        <!-- EVENTS/REGISTRATIONS/EVENTS  -->
+    <!-- EVENTS/REGISTRATIONS/EVENTS  -->
+
         <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
@@ -286,7 +357,6 @@
                     <group col="6" colspan="4">
                         <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
                         <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                        <field name="contact_id" attrs="{'readonly':[('state','!=', 'draft')]}" domain="[('partner_id','=',partner_id)]" on_change="onchange_contact_id(contact_id, context)"/>
                         <field name="nb_register"/>
                         <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
                         <field name="origin"/>
@@ -299,7 +369,7 @@
                                 <field name="email"/>
                                 <field name="phone"/>
                             </group>
-                            <group colspan="2" col="2" groups="base.group_extended">
+                            <group colspan="2" col="2" groups="base.group_no_one">
                                 <separator string="Dates" colspan="2"/>
                                 <field name="create_date"/>
                                 <field name="date_closed"/>
@@ -378,7 +448,7 @@
                         <separator orientation="vertical"/>
                         <field name="event_id" widget="selection"/>
                         <field name="name" string="Participant"
-                            filter_domain="['|','|','|', ('name','ilike',self), ('contact_id','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
+                            filter_domain="['|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
                         <field name="user_id" groups="base.group_extended">
                         <filter icon="terp-personal"
                               string="My Registrations"
@@ -413,7 +483,7 @@
         <menuitem
             name="Registrations"
             id="menu_action_registration" parent="base.menu_event_main"
-            action="action_registration"/>
+            action="action_registration" groups="event.group_event_manager,event.group_event_user"/>
 
 
         <menuitem name="Reporting" id="base.menu_report_association" parent="event_main_menu" sequence="20"/>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 4d5b12b8679..b6c8d832c6d 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -141,7 +141,8 @@
             <field name="act_window_id" ref="action_report_event_registration"/>
        </record>
 
-        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/>
+        <menuitem parent="base.menu_reporting" id="menu_reporting_events" sequence="30" groups="event.group_event_manager" name="Events"/>
+        <menuitem parent="menu_reporting_events" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index e7a84337bac..5055d517bd5 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -2,16 +2,22 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_event_manager" model="res.groups">
-        <field name="name">Event Manager</field>
-    </record>
+    <record model="ir.module.category" id="module_category_event_management">
+            <field name="name">Event</field>
+            <field name="description">Helps you manage your Events.</field>
+            <field name="sequence">3</field>
+        </record>
 
-    <record id="group_event_user" model="res.groups">
-        <field name="name">Event User</field>
+	<record id="group_event_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_event_management"/>
     </record>
 
-    <record model="res.users" id="base.user_admin">
-        <field eval="[(4,ref('group_event_manager'))]" name="groups_id"/>
+    <record id="group_event_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_event_management"/>
+        <field name="implied_ids" eval="[(4, ref('group_event_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <!-- Multi - Company Rules -->
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
new file mode 100644
index 00000000000..a0f738e6323
--- /dev/null
+++ b/addons/event/static/src/css/event.css
@@ -0,0 +1,118 @@
+.oe_event_date{
+  border-top-left-radius:3px;
+  border-top-right-radius:3px;
+  font-size: 48px;
+  height: auto;
+  font-weight: bold;
+  text-align: center;
+  margin-bottom:-7px;
+  color: #FFFFFF;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  background-color: #8A89BA;
+}
+.oe_event_time{
+  border-bottom-left-radius:3px;
+  border-bottom-right-radius:3px;
+  font-size: 12px;
+  text-align: center;
+  font-weight: bold;
+  color: #8A89BA;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  background-color: #FFFFFF;
+}
+.oe_event_month_year{
+  border-bottom-left-radius:3px;
+  border-bottom-right-radius:3px;
+  font-size: 12px;
+  text-align: center;
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #8A89BA;
+}
+div.oe_fold_column{
+  padding:0px !important;
+}
+.oe_event_button_subscribe {
+    display: inline-block;
+    border: 1px solid #ababab;
+    color: #404040;
+    font-size: 12px;
+    padding: 3px 10px;
+    text-align: center;
+    -o-background-size: 100% 100%;
+    -moz-background-size: 100% 100%;
+    -webkit-background-size: auto auto !important;
+    background-size: 100% 100%;
+    background: #d8d8d8 none;
+    background: none, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
+    background: none, -webkit-linear-gradient(#efefef, #d8d8d8);
+    background: none, -moz-linear-gradient(#efefef, #d8d8d8);
+    background: none, -o-linear-gradient(top, #efefef, #d8d8d8);
+    background: none, -khtml-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
+    background: -ms-linear-gradient(top, #efefef, #d8d8d8);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef', endColorstr='#d8d8d8',GradientType=0 );
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -o-border-radius: 3px;
+    -ms-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
+    -webkit-font-smoothing: antialiased;
+    outline: none;
+}
+.oe_event_button_unsubscribe {
+  display: inline-block;
+    border: 1px solid #AAA;
+    color: #404040;
+    font-size: 12px;
+    padding: 3px 10px;
+    text-align: center;
+    -o-background-size: 100% 100%;
+    -moz-background-size: 100% 100%;
+    -webkit-background-size: auto auto !important;
+    background-size: 100% 100%;
+    background: #AAA none;
+    background: none, -webkit-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
+    background: none, -webkit-linear-gradient(#AAA, #AAA);
+    background: none, -moz-linear-gradient(#AAA, #AAA);
+    background: none, -o-linear-gradient(top, #AAA, #AAA);
+    background: none, -khtml-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
+    background: -ms-linear-gradient(top, #AAA, #AAA);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#AAA, endColorstr='#AAA',GradientType=0 );
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -o-border-radius: 3px;
+    -ms-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
+    -webkit-font-smoothing: antialiased;
+    outline: none;
+}
+.oe_event_button_subscribe:hover {
+  cursor: pointer;
+  background-size: 100% 100%;
+  /*background: #DC5F59 none;*/
+
+}
+.oe_event_button_unsubscribe:hover {
+   cursor: pointer;
+   background-size: 100% 100%;
+   background: #DC5F59 none;
+ }
+ .unsubscribe, .unsubscribe_button:hover span {
+   display: none;
+   background-color: #DC5F59
+ }
+ .unsubscribe_button:hover .unsubscribe {
+   display: inline;
+   background-color: #DC5F59;
+ }
+
diff --git a/addons/event_project/i18n/sr@latin.po b/addons/event_project/i18n/sr@latin.po
index 5551c994091..e79669afced 100644
--- a/addons/event_project/i18n/sr@latin.po
+++ b/addons/event_project/i18n/sr@latin.po
@@ -8,29 +8,29 @@ 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:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-03-19 11:33+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\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:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-03-20 04:56+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr "Projekat Dogadjaja"
+msgstr "Projekat događaja"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr "Datum Zavrsetka"
+msgstr "Datum završetka"
 
 #. module: event_project
 #: view:event.project:0
 msgid "Ok"
-msgstr "U redu"
+msgstr "OK"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -39,20 +39,20 @@ msgid ""
 "After click on  'Create Retro-planning', New Project will be duplicated from "
 "this template project."
 msgstr ""
-"Ovo je Shema Projekta. Projekt dogadjaja je duplikat ove Sheme. Nakon Klika "
-"na ' Kreiraj Retro planiranje', novi projekat ce se duplicirati iz ove "
-"Projektne sheme."
+"Ovo je šema projekta. Projekat događaja je duplikat ove šeme. Pošto kliknete "
+"na 'Napravi retro-planiranje', novi projekat će biti dupliciran iz ove šeme "
+"projekta."
 
 #. module: event_project
 #: view:event.project:0
 #: model:ir.actions.act_window,name:event_project.action_event_project
 msgid "Retro-Planning"
-msgstr "Retro Planiranje"
+msgstr "Retro-planiranje"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Greška !  Datum završetka ne može biti pre datuma početka."
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -62,12 +62,12 @@ msgstr "Projekat"
 #. module: event_project
 #: field:event.project,project_id:0
 msgid "Template of Project"
-msgstr "Projektna Shema"
+msgstr "Šema projekta"
 
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Svi zadaci"
 
 #. module: event_project
 #: view:event.event:0
@@ -78,27 +78,27 @@ msgstr "Zadaci"
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Greška ! Ne možete praviti rekurzivne događaje."
 
 #. module: event_project
 #: field:event.event,task_ids:0
 msgid "Project tasks"
-msgstr "Projekat Zadataka"
+msgstr "Zadaci projekta"
 
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr "zatvori"
+msgstr "Zatvori"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr "Datum Pocetka"
+msgstr "Datum početka"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr "Kreiraj Retro-Planiranje"
+msgstr "Napravi retro-planiranje"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
@@ -108,7 +108,7 @@ msgstr "Događaj"
 #. module: event_project
 #: view:event.event:0
 msgid "Tasks management"
-msgstr "Upravljanje Zadacima"
+msgstr "Upravljanje zadacima"
 
 #~ msgid ""
 #~ "Organization and management of events.\n"
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index f92a9eb5617..d8f689986e2 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -37,8 +37,8 @@ It defines a new kind of service products that offers you the possibility to cho
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
         'event_sale_view.xml',
-        'event_demo.xml',
     ],
+    'demo_xml': ['event_demo.xml'],
     'test':['test/confirm.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index d1e23f49166..51702cf28fe 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -180,6 +180,8 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
             logger.info('start checking for new emails on %s server %s', server.type, server.name)
             context.update({'fetchmail_server_id': server.id, 'server_type': server.type})
             count = 0
+            imap_server = False
+            pop_server = False
             if server.type == 'imap':
                 try:
                     imap_server = server.connect()
diff --git a/addons/fetchmail/res_config.py b/addons/fetchmail/res_config.py
index 4d3bef8197a..2b4072a63c3 100644
--- a/addons/fetchmail/res_config.py
+++ b/addons/fetchmail/res_config.py
@@ -1,14 +1,13 @@
-#-*- coding:utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    mga@tinyerp.com
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/addons/fetchmail_crm/__init__.py b/addons/fetchmail_crm/__init__.py
deleted file mode 100644
index b5b36afb7e9..00000000000
--- a/addons/fetchmail_crm/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 OpenERP S.A. (<http://www.openerp.com>). All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm/__openerp__.py b/addons/fetchmail_crm/__openerp__.py
deleted file mode 100644
index 108cc5f4d59..00000000000
--- a/addons/fetchmail_crm/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 OpenERP S.A. (<http://www.openerp.com>). All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    "name" : "eMail Gateway for Leads",
-    "version" : "1.0",
-    "depends" : ["fetchmail", "crm"],
-    "author" : "OpenERP SA",
-    "category": 'Hidden',
-    "description": """
-    """,
-    'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-        "installer.xml",
-    ],
-    'demo_xml': [
-    ],
-    'installable': True,
-    'auto_install': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm/i18n/de.po b/addons/fetchmail_crm/i18n/de.po
deleted file mode 100644
index e82e8d68de8..00000000000
--- a/addons/fetchmail_crm/i18n/de.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# German 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-02-09 15:11+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "Erzeuge Kontakte vom Email Konto"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"Sie können Ihre E-Mails mit Verkaufs-Kontakten in OpenERP verbinden. Ein "
-"Email das an dieses Konto gesendet wird, erzeugt dann automatische einen "
-"Verkaufskontakt in OpenERP. Die gesamte Kommunikation mit dem Verkäufer wird "
-"dann diesem Verkaufskontakt zugeordnet."
diff --git a/addons/fetchmail_crm/i18n/es.po b/addons/fetchmail_crm/i18n/es.po
deleted file mode 100644
index ef1a0cd6485..00000000000
--- a/addons/fetchmail_crm/i18n/es.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Spanish 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-02-10 08:32+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr ""
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"No puede conectar su cuenta de email con iniciativas en OpenERP. Un nuevo "
-"email enviado a esta cuenta (por ejemplo: info@miempresa.com) creará "
-"automáticamente una iniciativa en OpenERP. Toda la comunicación con el "
-"comercial será adjuntada a la iniciativa automáticamente."
diff --git a/addons/fetchmail_crm/i18n/es_CR.po b/addons/fetchmail_crm/i18n/es_CR.po
deleted file mode 100644
index 6eae3fdc708..00000000000
--- a/addons/fetchmail_crm/i18n/es_CR.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Spanish (Costa Rica) 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-02-15 21:55+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
-"Language-Team: Spanish (Costa Rica) <es_CR@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-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "Crear clientes potenciales de cuentas de correo electrónico"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"No puede conectar su cuenta de email con iniciativas en OpenERP. Un nuevo "
-"email enviado a esta cuenta (por ejemplo: info@miempresa.com) creará "
-"automáticamente una iniciativa en OpenERP. Toda la comunicación con el "
-"comercial será adjuntada a la iniciativa automáticamente."
diff --git a/addons/fetchmail_crm/i18n/fetchmail_crm.pot b/addons/fetchmail_crm/i18n/fetchmail_crm.pot
deleted file mode 100644
index d614b85fda6..00000000000
--- a/addons/fetchmail_crm/i18n/fetchmail_crm.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* fetchmail_crm
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr ""
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "You can connect your email account with leads in OpenERP. A new email sent to this account (example: info@mycompany.com) will automatically create a lead in OpenERP. The whole communication with the salesman will be attached to the lead automatically."
-msgstr ""
-
diff --git a/addons/fetchmail_crm/i18n/fr.po b/addons/fetchmail_crm/i18n/fr.po
deleted file mode 100644
index f1f71379a4d..00000000000
--- a/addons/fetchmail_crm/i18n/fr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-02-10 10:36+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-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr ""
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
diff --git a/addons/fetchmail_crm/i18n/nl.po b/addons/fetchmail_crm/i18n/nl.po
deleted file mode 100644
index 58c3ff52e77..00000000000
--- a/addons/fetchmail_crm/i18n/nl.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Dutch 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-02-09 12:03+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-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "Maakt leads van een E-mail"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"Het is mogelijk om uw e-mail adres te koppelen aan leads in OpenERP. Van een "
-"nieuwe e-mail, welke naar dit adres (bijvoorbeeld: info@mijnbedrijf.com) "
-"wordt gestuurd, wordt automatisch een lead gemaakt in OPenERP. De gehele "
-"communicatie met de verkoper wordt automatisch gekoppeld aan de lead."
diff --git a/addons/fetchmail_crm/i18n/tr.po b/addons/fetchmail_crm/i18n/tr.po
deleted file mode 100644
index a52dcf088c3..00000000000
--- a/addons/fetchmail_crm/i18n/tr.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Turkish 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-02-09 23:08+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@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-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "E-posta hesabından fırsatlar oluştur"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"E-posta hesabınız ile OpenERP fırsatlarını birbirine bağlayabilirsiniz. Bu "
-"hesaba gönderilen yeni bir e-posta (mesela: satis@mycompany.com) için "
-"otomatik olarak bir fırsat oluşturulacak ve satış temsilcisiyle yapılan "
-"bütün mesaj trafiği fırsata otomatik olarak eklenecek."
diff --git a/addons/fetchmail_crm/i18n/zh_CN.po b/addons/fetchmail_crm/i18n/zh_CN.po
deleted file mode 100644
index 6c006483a94..00000000000
--- a/addons/fetchmail_crm/i18n/zh_CN.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Chinese (Simplified) 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-02-16 04:42+0000\n"
-"Last-Translator: wangsy <adminlii@hotmail.com>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@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-17 05:01+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "从邮件获取商机"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"你可以在OpenERP中连接包含商机的电子邮件账户，一封发往该账号的邮件(例如：info@mycompany.com)会自动创建一条商机。所有与该销售员的"
-"沟通会自动附加到此商机中。"
diff --git a/addons/fetchmail_crm/installer.xml b/addons/fetchmail_crm/installer.xml
deleted file mode 100644
index 5223367eb29..00000000000
--- a/addons/fetchmail_crm/installer.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record model="ir.actions.act_window" id="action_create_crm_leads_from_email_account">
-            <field name="name">Create Leads from Email Account</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">fetchmail.server</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context" eval="{'default_name': 'Incoming Leads', 'default_object_id': ref('crm.model_crm_lead')}"/>
-            <field name="help">You can connect your email account with leads in OpenERP. A new email sent to this account (example: info@mycompany.com) will automatically create a lead in OpenERP. The whole communication with the salesman will be attached to the lead automatically.</field>
-        </record>
-
-        <record model="ir.actions.todo" id="config_wizard_action_create_crm_leads_from_email_account">
-            <field name="action_id" ref="action_create_crm_leads_from_email_account" />
-            <field name="category_id" ref="base.category_sales_management_config" />
-        </record>
-    </data>
-</openerp>
diff --git a/addons/fetchmail_crm_claim/__init__.py b/addons/fetchmail_crm_claim/__init__.py
deleted file mode 100644
index b5b36afb7e9..00000000000
--- a/addons/fetchmail_crm_claim/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 OpenERP S.A. (<http://www.openerp.com>). All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm_claim/__openerp__.py b/addons/fetchmail_crm_claim/__openerp__.py
deleted file mode 100644
index 2a515205f9e..00000000000
--- a/addons/fetchmail_crm_claim/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 OpenERP S.A. (<http://www.openerp.com>). All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    "name" : "eMail Gateway for CRM Claim",
-    "version" : "1.0",
-    "depends" : ["fetchmail", "crm_claim"],
-    "author" : "OpenERP SA",
-    'category': 'Hidden',
-    "description": """
-    """,
-    'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-        "installer.xml",
-    ],
-    'demo_xml': [
-    ],
-    'installable': True,
-    'auto_install': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_crm_claim/i18n/de.po b/addons/fetchmail_crm_claim/i18n/de.po
deleted file mode 100644
index f70948419f1..00000000000
--- a/addons/fetchmail_crm_claim/i18n/de.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# German 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-02-09 15:10+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"Sie können Ihre E-Mails mit Reklamationen in OpenERP verbinden. Ein Email "
-"das an dieses Konto gesendet wird, erzeugt dann automatische eine "
-"Reklamation in OpenERP. Die gesamte Kommunikation wird dann dieser "
-"Reklamation zugeordnet."
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Erzeuge Reklamationen von diesem Mail Konto"
diff --git a/addons/fetchmail_crm_claim/i18n/es.po b/addons/fetchmail_crm_claim/i18n/es.po
deleted file mode 100644
index 8844c84fec5..00000000000
--- a/addons/fetchmail_crm_claim/i18n/es.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Spanish 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-02-10 08:35+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Crear reclamaciones a partir de cuentas de email"
diff --git a/addons/fetchmail_crm_claim/i18n/es_CR.po b/addons/fetchmail_crm_claim/i18n/es_CR.po
deleted file mode 100644
index 8e9a1e171bf..00000000000
--- a/addons/fetchmail_crm_claim/i18n/es_CR.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# Spanish (Costa Rica) 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-02-15 21:58+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
-"Language-Team: Spanish (Costa Rica) <es_CR@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-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"Puedes conectar tu cuenta de correo electrónico con derechos en OpenERP. Un "
-"nuevo correo enviado a esta cuenta (por ejemplo: support@mycompany.com) "
-"creará automáticamente un reclamo para el seguimiento en OpenERP. Toda la "
-"comunicación por correo electrónico se adjuntará a la solicitud de forma "
-"automática para realizar un seguimiento de la historia."
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Crear reclamaciones a partir de cuentas de email"
diff --git a/addons/fetchmail_crm_claim/i18n/fetchmail_crm_claim.pot b/addons/fetchmail_crm_claim/i18n/fetchmail_crm_claim.pot
deleted file mode 100644
index f4b85a56470..00000000000
--- a/addons/fetchmail_crm_claim/i18n/fetchmail_crm_claim.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* fetchmail_crm_claim
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "You can connect your email account with claims in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create a claim for the followup in OpenERP. The whole communication by email will be attached to the claim automatically to keep track of the history."
-msgstr ""
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr ""
-
diff --git a/addons/fetchmail_crm_claim/i18n/fr.po b/addons/fetchmail_crm_claim/i18n/fr.po
deleted file mode 100644
index 50a31809630..00000000000
--- a/addons/fetchmail_crm_claim/i18n/fr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-02-15 19:09+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-02-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr ""
diff --git a/addons/fetchmail_crm_claim/i18n/nl.po b/addons/fetchmail_crm_claim/i18n/nl.po
deleted file mode 100644
index 15c9812f502..00000000000
--- a/addons/fetchmail_crm_claim/i18n/nl.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# Dutch 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-02-12 15:20+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-02-13 04:50+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"Het is mogelijk uw e-mail account te koppelen aan claims in OpenERP. Een "
-"nieuwe e-mail, welke wordt verzonden naar dit account (bijvoorbeeld: "
-"support@mijnbedrijf.com), zal automatisch een claim aanmaken welke kan "
-"worden opgevolgd in OpenERP. De gehele communicatie van de e-mail wordt "
-"automatisch gekoppeld aan de claim, zodat de historie getraceerd kan worden."
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Maak claims van e-mail account"
diff --git a/addons/fetchmail_crm_claim/i18n/tr.po b/addons/fetchmail_crm_claim/i18n/tr.po
deleted file mode 100644
index 3d758e1713f..00000000000
--- a/addons/fetchmail_crm_claim/i18n/tr.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Turkish 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-02-09 23:11+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@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-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"E-posta hesabınızla OpenERP şikayetlerini bağlayabilirsiniz. Bu e-posta "
-"hesabına (örnek: sikayet@sirketim.com) gönderilen her e-posta için bir "
-"şikayet otomatik olarak oluşturulacak."
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "E-posta hesabından sikayet oluştur"
diff --git a/addons/fetchmail_crm_claim/i18n/zh_CN.po b/addons/fetchmail_crm_claim/i18n/zh_CN.po
deleted file mode 100644
index 1b4e3aacfcc..00000000000
--- a/addons/fetchmail_crm_claim/i18n/zh_CN.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Chinese (Simplified) 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-02-16 04:39+0000\n"
-"Last-Translator: wangsy <adminlii@hotmail.com>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@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-17 05:01+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"你可以在OpenERP中连接包含支持服务的电子邮件账户，一封发往该账号的邮件(例如：support@mycompany.com)会自动创建一条跟踪服务的记"
-"录。所有电子邮件沟通将自动附加在该支持服务记录上以保留所有跟踪的过程。"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "从电子邮件创建支持服务"
diff --git a/addons/fetchmail_crm_claim/installer.xml b/addons/fetchmail_crm_claim/installer.xml
deleted file mode 100644
index b3652a72938..00000000000
--- a/addons/fetchmail_crm_claim/installer.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record model="ir.actions.act_window" id="action_create_crm_claims_from_email_account">
-            <field name="name">Create Claims from Email Account</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">fetchmail.server</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context" eval="{'default_name': 'Claims', 'default_object_id' : ref('crm_claim.model_crm_claim')}"/>
-            <field name="help">You can connect your email account with claims in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create a claim for the followup in OpenERP. The whole communication by email will be attached to the claim automatically to keep track of the history.</field>
-        </record>
-
-        <record model="ir.actions.todo" id="config_wizard_action_create_crm_claims_from_email_account">
-            <field name="action_id" ref="action_create_crm_claims_from_email_account" />
-            <field name="category_id" ref="base.category_sales_management_config" />
-        </record>
-    </data>
-</openerp>
diff --git a/addons/fetchmail_hr_recruitment/i18n/ja.po b/addons/fetchmail_hr_recruitment/i18n/ja.po
new file mode 100644
index 00000000000..76eeb10ce74
--- /dev/null
+++ b/addons/fetchmail_hr_recruitment/i18n/ja.po
@@ -0,0 +1,32 @@
+# 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-01 05:45+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-02 04:37+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: fetchmail_hr_recruitment
+#: model:ir.actions.act_window,help:fetchmail_hr_recruitment.action_link_applicant_to_email_account
+msgid ""
+"You can synchronize the job email account (e.g. job@yourcompany.com) with "
+"OpenERP so that new applicants are created automatically in OpenERP for the "
+"followup of the recruitment process. Attachments are automatically stored in "
+"the DMS of OpenERP so that you get an indexation of all the CVs received."
+msgstr ""
+
+#. module: fetchmail_hr_recruitment
+#: model:ir.actions.act_window,name:fetchmail_hr_recruitment.action_link_applicant_to_email_account
+msgid "Create Applicants from Email Account"
+msgstr "Ｅメールアカウントから応募者を作成"
diff --git a/addons/fetchmail_hr_recruitment/i18n/sr@latin.po b/addons/fetchmail_hr_recruitment/i18n/sr@latin.po
new file mode 100644
index 00000000000..e5a9512224f
--- /dev/null
+++ b/addons/fetchmail_hr_recruitment/i18n/sr@latin.po
@@ -0,0 +1,36 @@
+# Serbian Latin 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-03-19 11:54+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\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-03-20 04:56+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
+
+#. module: fetchmail_hr_recruitment
+#: model:ir.actions.act_window,help:fetchmail_hr_recruitment.action_link_applicant_to_email_account
+msgid ""
+"You can synchronize the job email account (e.g. job@yourcompany.com) with "
+"OpenERP so that new applicants are created automatically in OpenERP for the "
+"followup of the recruitment process. Attachments are automatically stored in "
+"the DMS of OpenERP so that you get an indexation of all the CVs received."
+msgstr ""
+"Možete sinhronizovati svoj radni email nalog (npr:job@yourcompany.com) sa "
+"OpenERP-om, tako da se novi kandidati prave automatski u OpenERP-u za "
+"nstavak procesa zapošljavanja. Vezane stavke su automatski sačuvane u DMS-u "
+"OpenERP-a, tako da imate indeksaciju svih primljenih CV-a."
+
+#. module: fetchmail_hr_recruitment
+#: model:ir.actions.act_window,name:fetchmail_hr_recruitment.action_link_applicant_to_email_account
+msgid "Create Applicants from Email Account"
+msgstr "Napravi kandidate preko email naloga"
diff --git a/addons/fetchmail_project_issue/__init__.py b/addons/fetchmail_project_issue/__init__.py
deleted file mode 100644
index b5b36afb7e9..00000000000
--- a/addons/fetchmail_project_issue/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 OpenERP S.A. (<http://www.openerp.com>). All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_project_issue/__openerp__.py b/addons/fetchmail_project_issue/__openerp__.py
deleted file mode 100644
index 4d50a87bac8..00000000000
--- a/addons/fetchmail_project_issue/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#-*- coding:utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 OpenERP S.A. (<http://www.openerp.com>). All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    "name" : "eMail Gateway for Project Issues",
-    "version" : "1.0",
-    "depends" : ["fetchmail", "project_issue"],
-    "author" : "OpenERP SA",
-    "category": "Hidden",
-    "description": """
-    """,
-    'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-        "installer.xml",
-    ],
-    'demo_xml': [
-    ],
-    'installable': True,
-    'auto_install': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail_project_issue/i18n/de.po b/addons/fetchmail_project_issue/i18n/de.po
deleted file mode 100644
index 7f11791d711..00000000000
--- a/addons/fetchmail_project_issue/i18n/de.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# German 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-02-09 15:15+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "Erzeuge Fälle von Email Konto"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"Sie können Fälle von diesem Konto mit OpenERP verbinden. Ein Email das an "
-"dieses Konto gesendet wird, erzeugt dann automatische einen Fall  in "
-"OpenERP. Die gesamte Kommunikation wird dann diese Fall zugeordnet."
diff --git a/addons/fetchmail_project_issue/i18n/es_CR.po b/addons/fetchmail_project_issue/i18n/es_CR.po
deleted file mode 100644
index 0a5273af5d3..00000000000
--- a/addons/fetchmail_project_issue/i18n/es_CR.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Spanish (Costa Rica) 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-02-15 22:03+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
-"Language-Team: Spanish (Costa Rica) <es_CR@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-16 05:07+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "Crear problemas de la cuenta de correo electrónico"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"Puedes conectar tu cuenta de correo electrónico con asuntos en OpenERP. Un "
-"nuevo correo enviado a esta cuenta (por ejemplo: support@mycompany.com) "
-"creará automáticamente un problema. Toda la comunicación se concede a la "
-"cuestión de forma automática."
diff --git a/addons/fetchmail_project_issue/i18n/fetchmail_project_issue.pot b/addons/fetchmail_project_issue/i18n/fetchmail_project_issue.pot
deleted file mode 100644
index 1b0f11ca105..00000000000
--- a/addons/fetchmail_project_issue/i18n/fetchmail_project_issue.pot
+++ /dev/null
@@ -1,27 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* fetchmail_project_issue
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr ""
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "You can connect your email account with issues in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create an issue. The whole communication will be attached to the issue automatically."
-msgstr ""
-
diff --git a/addons/fetchmail_project_issue/i18n/fr.po b/addons/fetchmail_project_issue/i18n/fr.po
deleted file mode 100644
index 3738cef0f2a..00000000000
--- a/addons/fetchmail_project_issue/i18n/fr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-02-24 22:39+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-02-25 05:13+0000\n"
-"X-Generator: Launchpad (build 14860)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr ""
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
diff --git a/addons/fetchmail_project_issue/i18n/nl.po b/addons/fetchmail_project_issue/i18n/nl.po
deleted file mode 100644
index df0eacc3177..00000000000
--- a/addons/fetchmail_project_issue/i18n/nl.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Dutch 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-02-13 14: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-02-14 05:46+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "Maak vraagstukken van een e-mail"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"Het is mogelijk het vraagstukken e-mail account (bijvoorbeeld: "
-"vragen@mijnbedrijf.nl) te synchroniseren met OpenERP zo dat nieuwe "
-"vraagstukken automatisch worden aangemaakt in OpenERP. De gehele "
-"communicatie wordt als bijlage toegevoegd aan het vraagstuk."
diff --git a/addons/fetchmail_project_issue/i18n/zh_CN.po b/addons/fetchmail_project_issue/i18n/zh_CN.po
deleted file mode 100644
index c705ff0c111..00000000000
--- a/addons/fetchmail_project_issue/i18n/zh_CN.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# Chinese (Simplified) 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-02-16 04:36+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@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-17 05:01+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,name:fetchmail_project_issue.action_link_issue_to_email_account
-msgid "Create Issues from Email Account"
-msgstr "从邮件账号创建问题"
-
-#. module: fetchmail_project_issue
-#: model:ir.actions.act_window,help:fetchmail_project_issue.action_link_issue_to_email_account
-msgid ""
-"You can connect your email account with issues in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create "
-"an issue. The whole communication will be attached to the issue "
-"automatically."
-msgstr ""
-"你可以把你的邮件帐号与OpenERP中的问题关联。发送到这个帐号（例如：support@mycompany.com）的新邮件会自动创建一个问题。整个沟通过"
-"程会自动附加在这个问题上。"
diff --git a/addons/fetchmail_project_issue/installer.xml b/addons/fetchmail_project_issue/installer.xml
deleted file mode 100644
index 75554b2de29..00000000000
--- a/addons/fetchmail_project_issue/installer.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record model="ir.actions.act_window" id="action_link_issue_to_email_account">
-            <field name="name">Create Issues from Email Account</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">fetchmail.server</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context" eval="{'default_name': 'Issues', 'default_object_id': ref('project_issue.model_project_issue')}"/>
-            <field name="help">You can connect your email account with issues in OpenERP. A new email sent to this account (example: support@mycompany.com) will automatically create an issue. The whole communication will be attached to the issue automatically.</field>
-        </record>
-
-        <record model="ir.actions.todo" id="config_wizard_action_link_issue_to_email_account">
-            <field name="action_id" ref="action_link_issue_to_email_account" />
-            <field name="category_id" ref="project.category_project_config" />
-        </record>
-    </data>
-</openerp>
diff --git a/addons/google_base_account/i18n/fi.po b/addons/google_base_account/i18n/fi.po
new file mode 100644
index 00000000000..a5f41364adc
--- /dev/null
+++ b/addons/google_base_account/i18n/fi.po
@@ -0,0 +1,119 @@
+# Finnish 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-03-19 12:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-20 04:56+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Google tunnus"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Google kontaktien tuontivirhe!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Synkronointi "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Virhe"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Google tunnus"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Google salasana"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Peruuta"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Google tili"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Google käyttäjätunnus"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Google kontakti"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr ""
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Salasana"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Kirjautuminen ei onnistunut. Tarkista käyttäjätunnus ja salasana!"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "esim. user@gmail.com"
diff --git a/addons/google_base_account/i18n/it.po b/addons/google_base_account/i18n/it.po
new file mode 100644
index 00000000000..82c3e8b6c0e
--- /dev/null
+++ b/addons/google_base_account/i18n/it.po
@@ -0,0 +1,121 @@
+# Italian 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-03-26 09:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-27 04:51+0000\n"
+"X-Generator: Launchpad (build 15011)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Nome utente"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Login Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Errore nell'importazione dei contatti da Google!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Sincronizzazione "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Non è possibile avere due utenti con lo stesso login !"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Errore"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Login Google"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Password Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Account Google"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Nome Utente Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Prego installare gdata-python-client da http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Contatto Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_Accedi"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "L'azienda scelta non è fra la aziende abilitate per questo utente"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Password"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Autenticazione fallita, controlla il nome utente e la password !"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "es: user@gmail.com"
diff --git a/addons/google_map/google_map_launch.py b/addons/google_map/google_map_launch.py
index a60679e3b69..8ee9a16fb0a 100644
--- a/addons/google_map/google_map_launch.py
+++ b/addons/google_map/google_map_launch.py
@@ -22,10 +22,10 @@ from osv import osv
 
 class launch_map(osv.osv):
 
-    _inherit = "res.partner.address"
+    _inherit = "res.partner"
 
     def open_map(self, cr, uid, ids, context=None):
-        address_obj= self.pool.get('res.partner.address')
+        address_obj= self.pool.get('res.partner')
         partner = address_obj.browse(cr, uid, ids, context=context)[0]
         url="http://maps.google.com/maps?oi=map&q="
         if partner.street:
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 3911d879427..4cd7e4ad7c4 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -2,41 +2,6 @@
 <openerp>
     <data>
 
-        <record model="ir.ui.view" id="view_partner_address_form1_inheritg">
-            <field name="name">res.partner.address.form1.inheritg</field>
-            <field name="model">res.partner.address</field>
-            <field name="inherit_id" ref="base.view_partner_address_form1"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="street2" position="replace">
-                    <label string="Street2 : " align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="street2" nolabel="1"/>
-                        <button name="open_map"
-                           string="Map" type="object" icon="gtk-zoom-in"/>
-                    </group>
-                </field>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_partner_address_form2_inheritg">
-            <field name="name">res.partner.address.form2.inheritg</field>
-            <field name="model">res.partner.address</field>
-            <field name="inherit_id" ref="base.view_partner_address_form2"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="street2" position="replace">
-                    <label string="Street2 : " align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="street2" nolabel="1"/>
-                        <button name="open_map"
-                           string="Map" type="object" icon="gtk-zoom-in"/>
-                    </group>
-                </field>
-            </field>
-        </record>
-
-
         <record model="ir.ui.view" id="view_partner_form_inheritg">
             <field name="name">res.partner.form.inheritg</field>
             <field name="model">res.partner</field>
diff --git a/addons/google_map/i18n/ja.po b/addons/google_map/i18n/ja.po
new file mode 100644
index 00000000000..22768d7418a
--- /dev/null
+++ b/addons/google_map/i18n/ja.po
@@ -0,0 +1,35 @@
+# 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-01 05:50+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-02 04:37+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "地図"
+
+#. module: google_map
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "パートナの住所"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Street2 : "
+msgstr "住所２： "
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 76f9295a829..bd0c730d92d 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -19,9 +19,12 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-import logging
 import addons
+import io
+import logging
+from osv import fields, osv
+from PIL import Image
+import StringIO
 
 class hr_employee_category(osv.osv):
 
@@ -145,6 +148,34 @@ class hr_employee(osv.osv):
     _name = "hr.employee"
     _description = "Employee"
     _inherits = {'resource.resource': "resource_id"}
+
+    def onchange_photo(self, cr, uid, ids, value, context=None):
+        if not value:
+            return {'value': {'photo_big': value, 'photo': value} }
+        return {'value': {'photo_big': self._photo_resize(cr, uid, value, 540, 450, context=context), 'photo': self._photo_resize(cr, uid, value, context=context)} }
+    
+    def _set_photo(self, cr, uid, id, name, value, args, context=None):
+        if not value:
+            vals = {'photo_big': value}
+        else:
+            vals = {'photo_big': self._photo_resize(cr, uid, value, 540, 450, context=context)}
+        return self.write(cr, uid, [id], vals, context=context)
+    
+    def _photo_resize(self, cr, uid, photo, heigth=180, width=150, context=None):
+        image_stream = io.BytesIO(photo.decode('base64'))
+        img = Image.open(image_stream)
+        img.thumbnail((heigth, width), Image.ANTIALIAS)
+        img_stream = StringIO.StringIO()
+        img.save(img_stream, "JPEG")
+        return img_stream.getvalue().encode('base64')
+    
+    def _get_photo(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for hr_empl in self.browse(cr, uid, ids, context=context):
+            if hr_empl.photo_big:
+                result[hr_empl.id] = self._photo_resize(cr, uid, hr_empl.photo_big, context=context)
+        return result
+    
     _columns = {
         'country_id': fields.many2one('res.country', 'Nationality'),
         'birthday': fields.date("Date of Birth"),
@@ -155,10 +186,9 @@ class hr_employee(osv.osv):
         'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
         'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
         'department_id':fields.many2one('hr.department', 'Department'),
-        'address_id': fields.many2one('res.partner.address', 'Working Address'),
-        'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
-        'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
-        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
+        'address_id': fields.many2one('res.partner', 'Working Address'),
+        'address_home_id': fields.many2one('res.partner', 'Home Address'),
+        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),
         'mobile_phone': fields.char('Work Mobile', size=32, readonly=False),
         'work_email': fields.char('Work E-mail', size=240),
@@ -170,7 +200,11 @@ class hr_employee(osv.osv):
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
         'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
-        'photo': fields.binary('Photo'),
+        'photo_big': fields.binary('Big-sized employee photo', help="This field holds the photo of the employee. The photo field is used as an interface to access this field. The image is base64 encoded, and PIL-supported. Full-sized photo are however resized to 540x450 px."),
+        'photo': fields.function(_get_photo, fnct_inv=_set_photo, string='Employee photo', type="binary",
+            store = {
+                'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['photo_big'], 10),
+            }, help="Image used as photo for the employee. It is automatically resized as a 180x150 px image. A larger photo is stored inside the photo_big field."),
         'passport_id':fields.char('Passport No', size=64),
         'color': fields.integer('Color Index'),
         'city': fields.related('address_id', 'city', type='char', string='City'),
@@ -190,7 +224,7 @@ class hr_employee(osv.osv):
 
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
-            address = self.pool.get('res.partner.address').browse(cr, uid, address, context=context)
+            address = self.pool.get('res.partner').browse(cr, uid, address, context=context)
             return {'value': {'work_email': address.email, 'work_phone': address.phone, 'mobile_phone': address.mobile}}
         return {'value': {}}
 
@@ -217,7 +251,7 @@ class hr_employee(osv.osv):
 
     def _get_photo(self, cr, uid, context=None):
         photo_path = addons.get_module_resource('hr','images','photo.png')
-        return open(photo_path, 'rb').read().encode('base64')
+        return self._photo_resize(cr, uid, open(photo_path, 'rb').read().encode('base64'), context=context)
 
     _defaults = {
         'active': 1,
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index 977ca710e52..6b541f5a557 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -25,8 +25,8 @@
     </record>
 
     <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
-    <menuitem id="menu_hr_reporting" parent="menu_hr_root" name="Reporting" sequence="10" />
-    <menuitem id="menu_hr_dashboard" parent="menu_hr_reporting"  name="Dashboard" sequence="0"/>
+    <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
+    <menuitem id="menu_hr_dashboard" parent="base.menu_reporting_dashboard"  name="Human Resources" sequence="35"/>
     <menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
 
     <!-- This board view will be complete by other hr_* modules-->
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index b6a11f0b111..6c69f7a34ff 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -170,7 +170,7 @@
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">fp@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="employee_al" model="hr.employee">
@@ -182,7 +182,7 @@
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">al@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="employee_mit" model="hr.employee">
@@ -195,7 +195,7 @@
           <field name="work_phone">+3281813700</field>
           <field name="mobile_phone">+32486571630</field>
           <field name="work_email">mit@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="employee_niv" model="hr.employee">
@@ -207,7 +207,7 @@
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">niv@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="employee_stw" model="hr.employee">
@@ -219,7 +219,7 @@
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">stw@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="employee_chs" model="hr.employee">
@@ -231,7 +231,7 @@
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">chs@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="employee_qdp" model="hr.employee">
@@ -265,7 +265,7 @@
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">fpi@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAlgDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+hI4anSEVLGlTqlXzkcpCsNSLD6VOqVIqUcw7FdYqd5QqyqUoSi4WK/le1HlVa2e1Gyi4WKvlUnlg1a2UhXvii4WKpjHpSeUPSrRX2ppWncLFYxj0ppj9qtEYrJ1/XtF0GDztX1G3s0PQSP8zfRRyfwFFwsWTHUbJivLPFPxx0a03RaDYS38nI82b91GPcD7x/HbXk/iL4n+LNYZxPq0tvE2f3VqfKQA9uOSPqTVJCsfS+paxo2nhzfapZW2w4bzZ1Ug+hyawNQ+IPgqz3CXxBaOQOkW6X/0EGvlWa+lbJLZJ5JPeq8l6TzxnueaYcp9Rj4n+Bn3n+2cBDjJt5efp8tVrj4p+CI1kP8AacrbACNttJ8/GeOP54r5fe7cg8gA9hUL3JPH8OehFHMhcp9K6T8XPCd5G7Xr3GmkYx5sZcN9Nmf1FJefFnwbFKI4p7u4yfvRwYH/AI8Qf0r5rN2p4wVx0xTHvMLwSW9TRzByH0hc/FjwZGQBcXcmRklLc4Htz/Tiud1T406LE+2y0i8uOesjrHx68bq8HmumYn09KqyTvnOafOw9mj2jUvjU32iP7JoSLCDmTzZyWYcdMAAHr60V4ZK7Nkk0UvaMPZo/RqPHY5qZMV5pD9pIGS65JICyY/StC31LUbdwn2qQYGQWYEEfQ/0rzli4vc73hJLqegKBUigVx8HiW74LRQMoPJGQf51b/wCEqjXbus3wT1Vx/WtVWg+pi6E10OpAFO4rNsNVtbtB5UmGP8LDB/8Ar/hV3zBWiaexm01uS4HrSEj1rO1fWdN0e0N3ql9b2cA43zSBQT6DPU+w5ry7xX8dtCsWaHQrOXVJB/y1cmKIfTI3H8hTEewkiqOsavpWkW32jVdQtbKLs08oQH6Z6/hXy34n+M/jPVg0cN7HpkJ/gs12H/vskt+RFeeX2p3V3MZbq5lnkPVpHLE/iapRFc+qPEPxq8F6cjiznn1SYcBYIyq592bH5gGvPNd+P2tTMU0rSrKzX1lYzP8AnwP0rw57hjxnmopJiO+KpJBY9Pn+JHxF8RtJbWmp3r4UsyWcSxlV9SUAOPxrg9Qvrx7mVrtpmmDESGTJbd05z3pPC2uXejX017ay7HSBiOAQfwPB/HsTXSeKdYx8NdJlW1gS81qSWS6lK7nIVwcAnpljnjnj3rCdWUJqNtGdUKEJU3K+qOMe5LE8/nVeS5z0NUXmOc5qIyn1Nb3OexdM/PJqN5x/eqmzHP3qTeM0XFYtljsLjp3qPzAVDZyDUBk4OTx+lMLZ7j6UrhYnMh6gHFMd39OahLZPJxQZX2bQBnqT3ouA5idwUkDIzzSTeQIQQ7tITyMcAfWoi7YwRn60wjPTOPpSbuNCTFNgKtknt6UU14j/ABHbkcUUBY+1LLWNOnSRfs0si7fkZYn6+/I/rUk11GkJkXquWPmxnC+nP/1qp2sOrRAql6VDf9Mk44xxxWhFNrg35vImDjBBgX+nNed9SqX6fed/1un5kVvrylVDpHGAMKyIBkfhyRUzT2wkw8jF8HMa5Vge4wRWX/YdyZvOa4jLFs826Y+n+eazvEfhDWddkZr3xHdFCNojWMBQvYcHJH1JrVYKXczeLitkWtR8baHpanfcLNID/qkXe2fz4/HFcprXxj8QNC1vo6pZJ/z1k/eSfhuyB+R+tKfhLKQQNbcZ9YBx/wCPVWn+EFw3/Mf/AANuP/i66aeF5DnqYjnPPNc1rUdWuWutSvp7yf8AvyyFiB6DPQewrKeTABPGefwr0uf4O3WNqa8g/wC3f/7Oqcvwh1BTka3ExHf7P/8AZ1uqbMPaRPOJHU/xE/rVdmHT5h9RXpY+FmoIuJNWhYf9cf8A7Knj4cFYVjllSQqMZUbM/XrmjkkP2kO55fkMpAkOOvAqNmCjOQfxr0if4cADEbAHud/+Aqu3w5DD97cMGHcc5/l/OocZLoWpQfU4ayhkk067uuQigD9QP6/pW/4yVh4E8Mtg4jNzH+qH/Gn6lZR2Hh+5s4lZmW8WDGOSBksfwxmut/seHX/A+mxBF3xTsduCRggZ6fhXBVqe/F+f6HqU6NqT9Dxds980hJx0Nenz+B9LgcicKjZ4Xeyj/wAe/wAatweCNJKBWWDGOrT44+o+tbuvBbnD7GR5E2eaQgn1+levnwHo64drnTwAOA1zkDH0qjL4Q0aGYn7dprZUjC736+2P5UKvF7A6TR5aCQcAc0c7uBmvSz4f0mGVW8u2kA/h8o46Ut1YaU+Cmi2b4YEhS6cenBp876InkXc802Hqoxxg5pFikkkCxoXJPRRzXbavotvcPG1pZRaeoB3IJ3kB9/m/+vUK6HGcGabzNvZySF+gpqTauDikczFp1y0ixNGI5DjiZwnHr8xHFTX2lPaFEnvLL5lz+6nWUA+h2Zrbbw/aGVnFywU9FAA/z9KtfYrSKLy41xkYyBz+eKNe4tF0OUkggfLfa49wA2qwYAnvzjFFdBcWcckex2UgDCryFH+Jop69xXXY+mY0lP8AHg9uKehm3bfPB+i4BqvGDkqWB44JNSJLtX7zD1JHFdaOYtLG6/N5/HU4p7Bv+fjI9AAarpMjEYZZPcLkYp7SRK2RJnHXAwPypiJVAUHMvOPb/CkKsqBjMwHuMfpTXmxHuLZYnPP/ANYVH5u8Bg3HoP8AP+FK5LQj5ILJNkH2qJg23/WEE+9LPOoOWQFVP905FQTT+YpCo5PYlCP51VxWGTbuu8ke4qrIDnHmn6VNKwCjcwyOoPSq0rg4IbH41SZNiCYNyS5GTVSZgoJZ+nXJqeWRQDggk++a5nxJ4i0qztblZL+DMY/ehZASnbBA5yTxihy0HGN3Y57xBBPHpcN7xi71CUD33RkZ/In866+OwbT/AA9psMqFJCjFiBxnivFPGXjy/wBUt7CzskNrawlwm5ssWOPn9AcED8OtdT8PLibYkUl35zSxMxBYk7gw/wAa8ynTftYyfdnt1aqdKUY9l+B2s0zvHsebKn19Kw73SiCZ4EZkXkCJSzH3x0/DFa1yrKQrJnIz8rDFVLtpltZFjIXjpk/XsM16M4xluebFtGCTcpziN0/2xtb8qYtwZTwp3D+HHH8jT7JeXYRyxFTgqS2CT6A8fpUd7DIz+ZvVcf7Rya4JwVzojK6LSQsRukjyP9g4qQfZgMByv15qC3bcgdV5/wBpgB+mTQ6vI3ykjHUKpH86xaa2KvcsNGmPlLSfgMfyqvOkpzuhP0H+eKI4Z0/i/IVYilcDD9R601Jg0UZI04JRx74qB7KVm3BwVxwMHitdzDJ94DpndUEsAK5jc/ic/wA6tMkx57Fsfe/pRVy4WRQc7icdOn40VVxWPaIp12ZLFuBk4/TipGuIEcEyRL6ZOCf0rHTUIwcvIxx0wcD+ZFWjeh/khUh+oO3P412nGaS3LMCYuc8Bt3+PFOV5FzycDgcg4/D/ABzWabt3UI06pg5J3KOfxzViMjepkkGD0JOfyI6UCLqsoBARnbkt0Apks8zpmKMbeufX8cVVmurKEkGQMc9ACSc+/aq0moYH7lSqg8MznP8AOhahojSWR8fvG2nHIB4qpdXqpyCM+nWsya9klYZl2H09B9ce1RmZdqjc0g54GT+tUl3IuWXvlckBnDdMYqtNeJkiOPPqfWmNIvl/MCueMlsfhVMy7M4AJz+nbtVqwWZJJcOeN65xkDaRXz74/kibxdqMcTuY2uiWXOBuA+Y4+pNe7TMzAMsjoc89s14V8Tbea18W3TSNE3nESIVPRSMAH34P1696zq7G1NWZha4D/aUMUcRVY4QOORnJ/wDrivSPAEm29szC8iu8Um8ZxjPJB/KvPy6z35eU/KijO3uCc/8As1em+AIbhnM8srmJISATnli3GPwH61xx+KKO+1oyZ2HPPJz7EVGx56inN0PcVXkDnLqyhR1OP/r12XOMWREkKpI3H8KhsAn/AD3rFuo4grLMQNpxnOOau6jdSrmOJo9mMEo3zH6/y4rJmMezlwn481y1ZJmsERrJFFMBAGdieRVzdeytmOWJE9CuTWQnlpPvklVxnoB1/Stm3VRyoQA88CsXozQmgRwvzusjDrgY/rRKm8ZctntilXeGySCB2AxSyyLgkkAd6loCk3mqpClmHuKhW4JOGcqfrjBq08ysMKykfWqU4GSG2kHn3FSNai3F9tDAruB6Y9qKqTKgxgIw75FFUmxWPV4XVIgXcx5HdiT/ADpyS228Zcybc5w+M+xAJ/UVmW5glwqlnx6gkj8jgVoIYoYh5hijQcZaTB3emP8ACvSucNrl6OeKJC4jCIw5wWz+Oef0pkksBIV0VmIx+8OQfb/Iqo1zBHEr+bIxPClZQR+vJFRGVt7lcHOM5Gc/jj+VLcGi+suxs+XZRDH8CZb8Mnj9ailvUkOBbq2B953wB+FVRtPMssUWOcKBu/maabuxiGPNZj/vqpHHfoaeguVkwkuXYlVgVR/cAGPxwahuBduysHUjPysz8r9OOagfUE3fL9odTwGwNoppuAT8yk+igDB/LkU0xpBI9yPkM2TngAHP5VEZWUeXIzOc8ZcCpDK6DZHtjLdlOP0qCZ8HcEPfHzE5/I0cxaiLNMWbocetcD488NJrWsxTC4aGVowuNm4cE/412M9wVYE7V9MqR/OsS9uDJqIkVslGUj8+lc9epaOh2YSiqlRJ7HMWPw11J9Zlsor6BnhVNxZCAwKg479jiu6tdNv9ML2U5WaVW5dc7fujjntjFa2lTKnja8m6ZhjOP+2a1o+JsLdx3AwRKg6DPI4/wrzMLXlKtaXY9bH4ONLD80F1MBbeRAzsWbHOxcgH61nahdnJBXg9scCtuSVYVLs3/Ac1zmoXImcgACvUlKyPBitSk0inPGao3MpIICY9jV84z1qGVIiSxRWx65rmbN0ULZJJJBlMqDz6VuwFdoxx7VmCWNHwECgf3avRSB0BByDSAuq+V4zUMsYdecg+wB/pTY3YcEDA6HOc053J9hUiKyW/lbgCwB5yWz+nalMfBJIyfenBjkjLN3GV6VGzf3uo96GMpzQIM5DMaKkmOeMY9z1ooSFc7V7tokzNK8fOARwPphev41Vk1eKMth53YdN2Co9eM8VnR23nPuklTH8QV8/oKt29tZRMBvLMvQOrJj8Rz+tejY5GSJfTSMNsTbm/iEfX+fH41ajS7mGNvA43KBn+WKeWit0zs8pDyV3Bs/nmmyagDjy4xECMBgQPzGf60BYcloXzkyH1YKSPoR1/KlFsq/MxOR0O09Ppmq81/tB8y7jPPcnP6Aiqkmp2bHBkLbupKFifoaG0OxoSSqjgbo3z8vHP58ZFK0z4JCvgHspH86zjfhQBDaKrHoWK5/IVWuL66l+Q3CxjP3VxmodQtIv3V3DbjMpCsRnCglsf0qg+rwsMRxOT7qP/ANX86iKwYO/czn+L1qS2giQCSQDPZc8Co5m2VawGOe5Tzbg+UgG4KWySeuSfT2rF025jOpiBnLbDu/D0+netXX7gJpkzDjI25rz3W4Xi0B9UlJZ5pRAgyRtAyS3/AI7j86yrQ5lY7sHWVH32egLqhXxa08S7422oSp6jaAea6+8vIr2yS4gckQMUdeu3OMfyrwbwPdFdXjgfDQz/ACOn17j3HrXqHhq88j7do4/eFlLxyE8nndz+ORXD7H2Uo1F0PTli1iqcqVtXqWdUnBXGWrBLtk5xmpLu782TAyfXFQ5HpXdOVzw4xsOMmPXn2qvLIwJ71MSOoOKZKYyvJFZlIoMWd+oXnn3q5akZwwBI9aqvgMcAnP6U+CTDfNnAoGzUEhIz0HenLIWGDkfSqqOHQdPw5odyuNigj64qSCV3RSCWx9TUZmVyMSKfUdaaz89Mj3qGR9vXoe9ACzMcfJ680VXlfcMKRg9SDzRRcTNiK7gQ7SFk9mmY/oR/KpDq8kWY44gmOm6QsPy7VkmUIAgQIcfwyAj8B/8AXpyXDBNpkOD2bB/pXfzGFrF2S/vGzlmHuCTj6EdKI/tkpyHkkPruyR+dRW2GJkjIDDqyuc/kARUxvVIwxkk+oBB/Hg1LaAsW1izjLrL74bp+VWG+wWgzJuDA8gSZJ+oFUcXk8W4yrbW3dlbbn8zyaqypHGxCybh2JHP5VLlbYpRL8+pSODHb7YEP8KALn6nrUKvI2QrOeex61XjVmHzqFGMYPWpwyp93avuOP61OrK0RYjGwgngjp/n1qUynoapmbjBbA9c1GZFJwJBj8aey0C92LqCpeXFvYzSNEkjEsy9RxVTVdPsbrRn0tm2RAYVtuWU5yG/Ojdv1VPnOUiY5B9SBUknyn5Wy3qeayV+Zs6J2VOKMjwl4ct9Kumu2vUupgCI/kKhAe/J61s6rM8Bhvozh4pFOV9CcEfTmqqSSox3vuGf7oAFMvZfNtZIwc5HSlN3i0FFuNRSRb1Vit7J5AQBjvxnHXmq0U0pUGRAvPP0qS9kjjZTI4XcoCjPXgVXcK64Vyp64yc1jFuyNai99lneCcZxTXUYyWqrko/3yVAxjsKckgUjY7MP4lboB7HrTuZ8qFcKrY4B+tV5WCn075qaeQBeADxxWcznozBt3IIH6VSEzRsZS+ecgd6t5wMbifrWdZSjYwxg+1WXc470iSTzJNxBUBccHPNMlO7grke9R7n9c01nYZ5z7cVKYrCEKgwqgD0AoqCZm4xwO/FFNCHoIGAw+G+oX+tSmWKJRwjn18zn8hxWZ9sLNhFGTxuUbasq8cCB5Q0knVdwwp/qa67mRoRStcHiObjujE4Ht6VMs9raffk+0PjhQTgH3IP8AKscXNzcEgyEJ2VeAPwFWIYgBzgH/AGgam7Y9EXp7uW/IeaTbgYUBTgfzp8RVBlVU/wC0vJqquxf4JPwORTt/IID+xwR/LmmtALnnKTwwP9KaX5IR8fif6VVEmTtbYSR1A/8ArUhkOeXU/Uii4WJy4J+ZgSO+c1Fc7ljzHk5I+YHFMMqsOST7Hn9aTIxweDSbKSsyc3dvG3l+QzGRNvmP1HIIx+Wfx9slA6c/Ov8A3yOKpXDAbSecHjpUgl3ryFrOPum05OdmTttYcOPXpVO5QNkZGMduPennaD/9emkZ78UpMS0I7Yzz7oJctk5UnpjFWECxkoDyDggDvUafK2VbBp38RbPJ6ms7alOTY6RWwXTBwOM+tMZmCjPLH2okYlQPMIAqGR2CjJ5Hf1pBcc0m4cgelVJXG/aFfkdewp+75jj7vX8ahm5GAAfXI61SEx9nMElB6g8Vpblxx+lYWcFiSPbHarVtc5G3aTg07EM0DJn2+tMZzUbP+NRMcg5/Q0CJJG6Hg/jRVUnAIHT0ooQWK63IgJ8pPnHcgf8A66IC80hJOSfU0UVsnqJl0FkwC5/CnCXb1z+QooqrkEizBeSOP90U6OYt0PHb5cfyNFFSxolikCsxPG3qAOD/ACqMSHls/pRRSLsJ5uDyM0vmZNFFA7DZGG0g1HDJ8vTpRRUyKWxIH9qXf14ooqWMN4x0o8w5I9KKKkBjSEcc88VE0uT34FFFAFSSVgCVJGDgc0vm5jV8dQDRRQgKsswUlQCehqe0kxgD+KiimySz5gGM55pkjEg4JFFFIkhDlU+Zi3viiiimmB//2Q==</field>
       </record>
 
       <record id="employee_jth" model="hr.employee">
@@ -277,7 +277,7 @@
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">jth@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="employee_ngh" model="hr.employee">
@@ -289,7 +289,7 @@
           <field name="work_location">Auderghem</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">ngh@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">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</field>
       </record>
 
       <record id="employee_vad" model="hr.employee">
@@ -301,7 +301,7 @@
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">vad@openerp.com</field>
-          <field name="photo">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</field>
+          <field name="photo_big">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</field>
       </record>
 
     </data>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index a48103ad2e0..0171b41e881 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -55,7 +55,7 @@
             <field name="help">Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
         </record>
 
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" />
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/>
 
        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index fececd99600..a954d916385 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -8,8 +8,9 @@
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
-        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25" groups="base.group_no_one"/>
         <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
+        <menuitem id="base.menu_hr_reports" parent="hr.menu_hr_root" sequence="40" name="Reporting"/>
 
         <!--
         ==========
@@ -33,7 +34,7 @@
                         <field name="parent_id" />
                         </group>
                         <group colspan="2" col="1">
-                          <field name="photo" widget='image' nolabel="1"/>
+                          <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
                         </group>
                     </group>
                     <notebook colspan="6">
@@ -56,8 +57,7 @@
                             <group col="2" colspan="2">
                                 <separator string="Contact Information" colspan="2"/>
                                 <field name="address_home_id" colspan="2"/>
-                                <field name="partner_id" invisible="1" />
-                                <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" domain="[('partner_id', '=', partner_id)]"/>
+                                <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" />
                                 <field name="work_phone"/>
                                 <field name="mobile_phone"/>
                                 <field name="work_email" widget="email" />
@@ -130,7 +130,6 @@
         <field name="model">hr.employee</field>
         <field name="type">kanban</field>
         <field name="arch" type="xml">
-
             <kanban>
                 <templates>
                     <t t-name="kanban-box">
@@ -313,7 +312,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1"/>
+            parent="hr.menu_hr_configuration" sequence="1"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -340,7 +339,7 @@
         </record>
 
         <menuitem action="open_view_categ_tree"
-            id="menu_view_employee_category_tree" parent="menu_view_employee_category_configuration_form" sequence="2"/>
+            id="menu_view_employee_category_tree" parent="menu_hr_management" sequence="2"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">
             <field name="name">hr.job.form</field>
@@ -434,7 +433,7 @@
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
-        <menuitem parent="hr.menu_view_employee_category_configuration_form" id="menu_hr_job" action="action_hr_job" sequence="2"/>
+        <menuitem parent="hr.menu_hr_management" id="menu_hr_job" action="action_hr_job" sequence="6"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 394479311ca..d0a0734eca0 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-28 02:39+0000\n"
+"PO-Revision-Date: 2012-03-31 01:57+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-29 04:42+0000\n"
-"X-Generator: Launchpad (build 14874)\n"
+"X-Launchpad-Export-Date: 2012-04-01 04:38+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -248,7 +248,7 @@ msgstr "报告"
 #: 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 "人力资源控制台"
+msgstr "人力资源仪表盘"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
@@ -306,7 +306,7 @@ msgstr "员工联系方式"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr "我的控制台"
+msgstr "我的面板"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -399,7 +399,7 @@ msgstr "工作地址"
 #: 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 "人力资源经理控制台"
+msgstr "人力资源经理仪表盘"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -585,7 +585,7 @@ msgstr "准假"
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr "人力资源经理控制台"
+msgstr "人力资源经理面板"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index e8d1edd3712..0f72d37f32f 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -11,6 +11,7 @@
         <field name="name">HR Manager</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     <record id="hr_dept_comp_rule" model="ir.rule">
         <field name="name">Department multi company rule</field>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 2911a49bf53..121e0f23f25 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -7,5 +7,4 @@ access_hr_employee_resource_user,resource.resource.user,resource.model_resource_
 access_hr_department_user,hr.department.user,model_hr_department,base.group_hr_user,1,1,1,1

 access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0

 access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1

-access_hr_res_partner_address,res.partner.address,base.model_res_partner_address,base.group_hr_manager,1,1,1,1

 access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0

diff --git a/addons/hr/test/hr_demo.yml b/addons/hr/test/hr_demo.yml
index 89fc604376a..7c184a25c52 100644
--- a/addons/hr/test/hr_demo.yml
+++ b/addons/hr/test/hr_demo.yml
@@ -4,7 +4,7 @@
     no_of_recruitment: 5.0
 -
   !record {model: hr.employee, id: employee_niv, view: False}:
-    address_id: base.main_address
+    address_id: base.main_partner
     company_id: base.main_company
     department_id: dep_rd
     user_id: base.user_demo
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 7d7cb60fa16..258177bfd5e 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -77,9 +77,9 @@
             <field name="help">The Time Tracking functionality aims to manage employee attendances from Sign in/Sign out actions. You can also link this feature to an attendance device using OpenERP's web service features.</field>
         </record>
 
-        <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
+        <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="5" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
 
-        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
+        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="10" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
 
         <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>
 
@@ -117,9 +117,9 @@
         </record>
 
         <menuitem
-            sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
-            groups="base.group_extended"/>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config"/>
+            sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
+            groups="base.group_no_one"/>
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" />
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 5a4f84a9692..9e0017fed8c 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="30" groups="base.group_no_one"/>
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e5107c7b720..e38a8796895 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -62,10 +62,10 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
+        <menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="25"/>
         <menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
-        <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
-            action="open_view_hr_evaluation_plan_tree"/>
+        <menuitem parent="hr.menu_hr_configuration" id="menu_open_view_hr_evaluation_plan_tree"
+            action="open_view_hr_evaluation_plan_tree" sequence="15"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
             <field name="name">hr_evaluation.plan.phase.form</field>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index bac38acee08..6e7db83bbb7 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -183,24 +183,20 @@ class hr_expense_expense(osv.osv):
                 }))
             if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error !'), _('The employee must have a Home address.'))
-            if not exp.employee_id.address_home_id.partner_id:
-                raise osv.except_osv(_('Error !'), _("The employee's home address must have a partner linked."))
-            acc = exp.employee_id.address_home_id.partner_id.property_account_payable.id
-            payment_term_id = exp.employee_id.address_home_id.partner_id.property_payment_term.id
+            acc = exp.employee_id.address_home_id.property_account_payable.id
+            payment_term_id = exp.employee_id.address_home_id.property_payment_term.id
             inv = {
                 'name': exp.name,
                 'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
                 'account_id': acc,
                 'type': 'in_invoice',
-                'partner_id': exp.employee_id.address_home_id.partner_id.id,
-                'address_invoice_id': exp.employee_id.address_home_id.id,
-                'address_contact_id': exp.employee_id.address_home_id.id,
+                'partner_id': exp.employee_id.address_home_id.id,
                 'company_id': company_id,
                 'origin': exp.name,
                 'invoice_line': lines,
                 'currency_id': exp.currency_id.id,
                 'payment_term': payment_term_id,
-                'fiscal_position': exp.employee_id.address_home_id.partner_id.property_account_position.id
+                'fiscal_position': exp.employee_id.address_home_id.property_account_position.id
             }
             if payment_term_id:
                 to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [], payment_term_id, None)
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 23883b79838..66d2aa89617 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -114,11 +114,11 @@
                             <field name="journal_id"/>
                             <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
                             </group>
-                            <group col="2" colspan="2">
-                            <separator colspan="2" string="Validation"/>
-                            <field name="date_confirm" readonly = "1"/>
-                            <field name="date_valid" readonly = "1"/>
-                            <field name="user_valid"/>
+                            <group col="2" colspan="2" groups="base.group_no_one">
+                                <separator colspan="2" string="Validation"/>
+                                <field name="date_confirm" readonly = "1"/>
+                                <field name="date_valid" readonly = "1"/>
+                                <field name="user_valid"/>
                             </group>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
@@ -177,7 +177,7 @@
             <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
+        <menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/>
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 82bc71f5966..6c7b6f27c8d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -12,9 +12,9 @@
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" name="year" string="Year" domain="[('date_from','&gt;=',time.strftime('%%Y-1-1')),('date_from','&lt;=',time.strftime('%%Y-12-31'))]"/>
+                        <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                         <filter icon="terp-go-month" name="This Month" string="Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" name="This Month-1" string=" Month-1" 
+                        <filter icon="terp-go-month" name="This Month-1" string=" Month-1"
                          domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Holidays during last month"/>
                         <separator orientation="vertical"/>
@@ -50,7 +50,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
-                <calendar string="Leave Request" color="name" date_start="date_from" date_stop="date_to">
+                <calendar string="Leave Request" color="user_id" date_start="date_from" date_stop="date_to">
                     <field name="holiday_status_id"/>
                 </calendar>
             </field>
@@ -251,7 +251,7 @@
         </record>
 
         <!-- My leave dashboard -->
-        <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="5"/>
+        <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
             <field name="name">Leave Requests</field>
@@ -442,7 +442,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_open_view_attendance_reason_config"/>
+        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10" />
 
     <!-- holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index cd7665be123..22cdca38936 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -32,9 +32,11 @@
             <field name="target">new</field>
         </record>
 
+		<menuitem id="menu_hr_leaves_reports" parent="base.menu_hr_reports" sequence="10" name="Leaves"/>
+		
 		<menuitem
 	        name="Leaves by Department"
-	        parent="menu_hr_reporting_holidays"
+	        parent="menu_hr_leaves_reports"
 	        action="action_hr_holidays_summary_dept"
 	        id="menu_account_central_journal"
 	        groups="base.group_extended"
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 92a88f9177a..e0212a68646 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -2,8 +2,9 @@
 <openerp>
     <data>
         <!-- Root Menus -->
-        <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="9"/>
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
+
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_no_one" sequence="45"/>
+        <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
         <!-- Employee View -->
@@ -138,8 +139,8 @@
         <menuitem
             id="menu_hr_payroll_structure_view"
             action="action_view_hr_payroll_structure_list_form"
-            parent="payroll_configure"
-            sequence="1"
+            parent="hr.menu_hr_configuration"
+            sequence="20"
         />
         <record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
             <field name="name">Salary Structures Hierarchy</field>
@@ -670,7 +671,7 @@
             <field name="search_view_id" ref="view_hr_rule_filter"/>
         </record>
 
-        <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
+        <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12" groups="base.group_no_one"/>
 
 
         <act_window name="All Children Rules"
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 68855b79d7d..d1a4ba2c285 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -141,8 +141,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'probability': fields.float('Probability'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
index a4817fb4499..9160c2fb1d2 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ b/addons/hr_recruitment/hr_recruitment_demo.yml
@@ -12,7 +12,6 @@
 
 -
   !record {model: hr.applicant, id: hr_case_traineemca0}:
-    partner_address_id: base.res_partner_address_14
     date: !eval time.strftime('%Y-%m-10 18:15:00')
     type_id: degree_bac5
     priority: '3'
@@ -70,7 +69,6 @@
     partner_phone: '33968745'
 -
   !record {model: hr.applicant, id: hr_case_traineemca1}:
-    partner_address_id: base.res_partner_address_14
     date: !eval time.strftime('%Y-%m-12 17:49:19')
     type_id: degree_bac5
     partner_name: 'Tina Augustie'
@@ -83,7 +81,6 @@
 
 -
   !record {model: hr.applicant, id: hr_case_programmer}:
-    partner_address_id: base.res_partner_address_14
     date: !eval time.strftime('%Y-%m-12 17:49:19')
     type_id: degree_bac5
     partner_name: 'Shane Williams'
@@ -100,7 +97,6 @@
   !record {model: hr.applicant, id: hr_case_advertisement}:
     date: !eval time.strftime('%Y-%m-26 17:39:42')
     type_id: degree_licenced
-    partner_id: base.res_partner_11
     partner_name: 'David Armstrong'
     job_id: hr.job_developer
     stage_id: stage_job2
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 69a7c104073..d47ff2b9986 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -5,7 +5,7 @@
             id="menu_hr_recruitment_recruitment"
             name="Recruitment"
             parent="hr.menu_hr_configuration"
-            sequence="2"/>
+            sequence="40" />
 
     # ------------------------------------------------------
     # Job Categories
@@ -42,7 +42,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Applicants" colors="grey:state in ('cancel','done');blue:state=='pending'">
-                <field name="create_date"/>
+                <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
@@ -104,7 +104,6 @@
                                     name="%(action_hr_recruitment_partner_create)d"
                                     icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
                             <newline/>
-                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
                             <field name="email_from" colspan="3"/>
                             <field name="partner_phone" colspan="3"/>
                             <field name="partner_mobile" colspan="3"/>
@@ -124,7 +123,7 @@
                             <field name="source_id"/>
                             <field name="reference"/>
                         </group>
-                        <group col="2" colspan="2">
+                        <group col="2" colspan="2" groups="base.group_no_one">
                            <separator colspan="2" string="Dates"/>
                            <field name="create_date"/>
                            <field name="write_date"/>
@@ -228,8 +227,8 @@
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
+                    <separator orientation="vertical" groups="base.group_no_one"/>
+                    <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
            </search>
         </field>
@@ -461,7 +460,7 @@
             name="Degrees"
             parent="menu_hr_recruitment_recruitment"
             action="hr_recruitment_degree_action"
-            sequence="1"/>
+            sequence="5" groups="base.group_no_one"/>
 
 <!-- Source Tree View -->
 
@@ -495,7 +494,7 @@
             id="menu_hr_recruitment_source"
             parent="menu_hr_recruitment_recruitment"
             action="hr_recruitment_source_action"
-            sequence="1"/>
+            sequence="10" groups="base.group_no_one"/>
 
 
     </data>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 6ea03bbf114..1a596dfa2c6 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -62,7 +62,6 @@ class hr_recruitment_report(osv.osv):
         'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg", digits_compute=dp.get_precision('Account')),
         'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
         'available': fields.float("Availability"),
         'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
@@ -84,7 +83,6 @@ class hr_recruitment_report(osv.osv):
                      s.state,
                      s.partner_id,
                      s.company_id,
-                     s.partner_address_id,
                      s.user_id,
                      s.job_id,
                      s.type_id,
@@ -110,7 +108,6 @@ class hr_recruitment_report(osv.osv):
                      s.date_closed,
                      s.state,
                      s.partner_id,
-                     s.partner_address_id,
                      s.company_id,
                      s.user_id,
                      s.stage_id,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 07f160b8ee2..994102cab43 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -14,7 +14,6 @@
                 <field name="department_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
-                <field name="partner_address_id" invisible="1"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state" invisible="1"/>
                 <field name="year" invisible="1"/>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 6449cc60fda..6bbc30b7b41 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -5,7 +5,6 @@ access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_
 access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,base.group_hr_user,1,1,1,1

 access_mail_message_user,mail.message.user,mail.model_mail_message,base.group_hr_user,1,1,1,1

 access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1

-access_res_partner_address_hr_user,res.partner.address.user,base.model_res_partner_address,base.group_hr_user,1,1,1,1

 access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,1,0

 access_crm_phonecall_hruser,crm.phonecall hruser,crm.model_crm_phonecall,base.group_hr_user,1,1,1,1

 access_crm_meeting_hruser,crm.meeting.hruser,crm.model_crm_meeting,base.group_hr_user,1,1,1,1

diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index dd1667aecef..d7a099e7257 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -42,7 +42,6 @@ class hr_recruitment_partner_create(osv.osv_memory):
     def make_order(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
         case_obj = self.pool.get('hr.applicant')
 
         if context is None:
@@ -59,10 +58,6 @@ class hr_recruitment_partner_create(osv.osv_memory):
                 'name': case.partner_name or case.name,
                 'user_id': case.user_id.id,
                 'comment': case.description,
-            }, context=context)
-            contact_id = contact_obj.create(cr, uid, {
-                'partner_id': partner_id,
-                'name': case.partner_name,
                 'phone': case.partner_phone,
                 'mobile': case.partner_mobile,
                 'email': case.email_from
@@ -70,7 +65,6 @@ class hr_recruitment_partner_create(osv.osv_memory):
 
             case_obj.write(cr, uid, case.id, {
                 'partner_id': partner_id,
-                'partner_address_id': contact_id
             }, context=context)
         if data['close']:
             case_obj.case_close(cr, uid, context['active_ids'])
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index 0f7d30b215a..12c294c20bc 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -99,7 +99,6 @@ class job2phonecall(osv.osv_memory):
                         'date': form.deadline,
                         'description': job.description,
                         'partner_id': job.partner_id.id,
-                        'partner_address_id': job.partner_address_id.id,
                         'partner_phone': job.partner_phone,
                         'partner_mobile': job.partner_mobile,
                         'description': job.description,
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 8b038191794..352bacd0b06 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -111,6 +111,8 @@
             </field>
         </record>
 
+        <menuitem id="menu_hr_timesheet_reports" parent="base.menu_hr_reports" sequence="5" name="Timesheet"/>
+
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/i18n/es_EC.po b/addons/hr_timesheet/i18n/es_EC.po
new file mode 100644
index 00000000000..b5d3252d359
--- /dev/null
+++ b/addons/hr_timesheet/i18n/es_EC.po
@@ -0,0 +1,657 @@
+# Spanish (Ecuador) 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-03-27 14:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-28 04:46+0000\n"
+"X-Generator: Launchpad (build 15027)\n"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Wed"
+msgstr "Miércoles"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr "(Vacío para fecha actual)"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "¡No se ha definido un empleado para su usuario!"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
+msgid ""
+"Employees can encode their time spent on the different projects. A project "
+"is an analytic account and the time spent on a project generate costs on the "
+"analytic account. This feature allows to record at the same time the "
+"attendance and the timesheet."
+msgstr ""
+"Los empleados pueden imputar el tiempo que han invertido en los diferentes "
+"proyectos. Un proyecto es una cuenta analítica y el tiempo  de empleado en "
+"un proyecto genera costes en esa cuenta analítica. Esta característica "
+"permite registrar al mismo tiempo la asistencia y la hoja de tiempos."
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr "Parar de trabajar"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
+msgid "Employee Timesheet"
+msgstr "Horario del empleado"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Work done stats"
+msgstr "Estadísticas trabajo realizado"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
+msgid "Timesheet"
+msgstr "Hoja de asistencia"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Mon"
+msgstr "Lunes"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "Acceder"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Fri"
+msgstr "Viernes"
+
+#. module: hr_timesheet
+#: field:hr.employee,uom_id:0
+msgid "UoM"
+msgstr "UoM"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid ""
+"Employees can encode their time spent on the different projects they are "
+"assigned on. A  project is an analytic account and the time spent on a "
+"project generates costs on the analytic account. This feature allows to "
+"record at the same time the attendance and the timesheet."
+msgstr ""
+"Los empleados pueden imputar el tiempo que han invertido en los diferentes "
+"proyectos. Un proyecto es una cuenta analítica y el tiempo  de empleado en "
+"un proyecto genera costes en esa cuenta analítica. Esta característica "
+"permite registrar al mismo tiempo la asistencia y la hoja de tiempos."
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr "Importe analítico mínimo"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr "Hoja de asistencia mensual del Empleado"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr "Trabajo realizado en el último período"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current state"
+msgstr "Estado actual"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr "Nombre de empleados"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Project / Analytic Account"
+msgstr "Proyecto / Cuenta Analítica"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr "Imprimir hoja de asistencia de los Empleados"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:175
+#: code:addons/hr_timesheet/hr_timesheet.py:177
+#, python-format
+msgid "Warning !"
+msgstr "Advertencia !"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "UserError"
+msgstr "Error de usuario"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#, python-format
+msgid "No cost unit defined for this employee !"
+msgstr "¡No se ha definido un coste unitario para este empleado!"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Tue"
+msgstr "Martes"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner"
+msgstr "Cliente"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out By Project"
+msgstr "Acceder/salir del proyecto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Sat"
+msgstr "Sábado"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Sun"
+msgstr "Domingo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Analytic account"
+msgstr "Cuenta Analítica"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+msgid "Timesheet Lines"
+msgstr "Líneas de la hoja de asistencia"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr "Hoja de asistencia mensual de empleados"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "July"
+msgstr "Julio"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: hr_timesheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+"No se puede modificar una entrada Confirmado / Hoja de asistencia ya hecha!."
+
+#. module: hr_timesheet
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr ""
+"Especifica la designación del empleado como un producto de tipo 'servicio'."
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr "Coste total"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "September"
+msgstr "Septiembre"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de servicios"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by month"
+msgstr "Estadísticas por mes"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: field:hr.analytical.timesheet.employee,month:0
+#: field:hr.analytical.timesheet.users,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr "Descripción del trabajo"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Invoice Analysis"
+msgstr "Análisis de facturas"
+
+#. module: hr_timesheet
+#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
+msgid "Employee timesheet"
+msgstr "Hoja de asistencia del empleado"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
+msgid "Sign in / Sign out by project"
+msgstr "Entrada/salida por proyecto"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
+msgid "Define your Analytic Structure"
+msgstr "Defina su estructura analítica"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Registrar entrada/salida"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:175
+#, python-format
+msgid ""
+"Analytic journal is not defined for employee %s \n"
+"Define an employee for the selected user and assign an analytic journal!"
+msgstr ""
+"El diario analítico no está definido para el empleado %s\n"
+"¡Defina un empleado para el usuario seleccionado y asígnele un diario "
+"analítico!"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(Keep empty for current time)"
+msgstr "(Dejarlo vacío para hora actual)"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
+msgid ""
+"You should create an analytic account structure depending on your needs to "
+"analyse costs and revenues. In OpenERP, analytic accounts are also used to "
+"track customer contracts."
+msgstr ""
+"Debe crear una estructura de la cuenta analítica dependiendo de sus "
+"necesidades para analizar los costos e ingresos. En OpenERP, cuentas "
+"analíticas también se utilizan para seguimiento de contratos de clientes."
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,line_id:0
+msgid "Analytic Line"
+msgstr "Línea Analítica"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "June"
+msgstr "Junio"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Print My Timesheet"
+msgstr "Imprimir mi horario"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "November"
+msgstr "Noviembre"
+
+#. module: hr_timesheet
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,date:0
+msgid "Closing Date"
+msgstr "Fecha de cierre"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "October"
+msgstr "Octubre"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "January"
+msgstr "Enero"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Key dates"
+msgstr "Fechas clave"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Thu"
+msgstr "Jueves"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis stats"
+msgstr "Estadísticas de análisis"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr "Imprime el 'Parte de Horas del Empleado' y 'Mi Parte de Horas'"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "ID empleado"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
+msgid "My Timesheet"
+msgstr "My horario"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "December"
+msgstr "Diciembre"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
+#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
+#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
+msgid "Employees Timesheet"
+msgstr "Horario de empleados"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr "Información"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "Empleado(a)"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid ""
+"Through this menu you can register and follow your workings hours by project "
+"every day."
+msgstr ""
+"A través de este menú se puede registrar y seguir las horas diarias "
+"trabajadas por proyecto."
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
+msgid "Current Date"
+msgstr "Fecha Actual"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "This wizard will print monthly timesheet"
+msgstr "Este asistente imprimirá el parte de horas mensual"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: field:hr.employee,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "May"
+msgstr "Mayo"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total time"
+msgstr "Tiempo total"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(local time on the server side)"
+msgstr "(hora local en el servidor)"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr "Registrarse en un proyecto"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "February"
+msgstr "Febrero"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr "Salir de un proyecto"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "Empleados"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:177
+#, python-format
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
+msgstr ""
+"No se ha definido una cuenta analítica para el proyecto.\n"
+"Por favor seleccione una o no se puede llenar automáticamente la hoja de "
+"asistencia."
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Start Working"
+msgstr "Empezar a trabajar"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by user"
+msgstr "Estadísticas por usuario"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "No employee defined for this user"
+msgstr "No se ha definido un empleado para este usuario"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr "Administración Financiera"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr "Cambiar trabajo"
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 63e493cfab7..063481f5211 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -34,7 +34,7 @@
 
         <menuitem action="action_hr_timesheet_employee"
         	id="menu_hr_timesheet_employee"
-        	parent="menu_hr_reporting_timesheet"
+        	parent="menu_hr_timesheet_reports"
         	groups="base.group_extended" sequence="2" icon="STOCK_PRINT"/>
 
 
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 95b7bd3b93e..f51ccc769c4 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -37,7 +37,7 @@
 
         <menuitem action="action_hr_timesheet_users"
         	id="menu_hr_timesheet_users"
-        	parent="menu_hr_reporting_timesheet"
+        	parent="menu_hr_timesheet_reports"
         	groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
 
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 11b7bb771fa..0a58efb782b 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -78,24 +78,22 @@ class account_analytic_account(osv.osv):
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
     def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
-        res = super(account_analytic_account, self).on_change_partner_id(cr, uid, id, partner_id, context)
-        if (not res.get('value', False)) or not partner_id:
-            return res
+        res={}
         part = self.pool.get('res.partner').browse(cr, uid, partner_id)
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         if pricelist:
-            res['value']['pricelist_id'] = pricelist
-        return res
+            res['pricelist_id'] = pricelist
+        return {'value': res}
 
     def set_close(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'close'}, context=context)
-    
+
     def set_cancel(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
-    
+
     def set_open(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'open'}, context=context)
-      
+
     def set_pending(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'pending'}, context=context)
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 30cafc5a0b4..2f5c8d24d79 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -7,6 +7,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
+                <field name="partner_id" position="replace">
+                    <field name="partner_id" on_change="on_change_partner_id(partner_id, context)"/>
+                </field>
                 <group name="contract" position="after">
                     <group colspan="2" col="2" name="invoice_data">
                         <separator colspan="2" string="Invoicing Data"/>
@@ -185,7 +188,7 @@
         <menuitem
             action="action_hr_timesheet_invoice_factor_form"
             id="hr_timesheet_invoice_factor_view"
-            parent="account.menu_configuration_misc" sequence="25"/>
+            parent="account.menu_configuration_misc" sequence="25" groups="base.group_no_one"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 33de63ba347..be090dfcdbb 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -3,8 +3,8 @@
     <data>
         <menuitem
             id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
+            name="Human Resources"
+            parent="base.menu_reporting"
             sequence="40" />
 
         <record id="view_timesheet_line_graph" model="ir.ui.view">
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 1ed51fc0a63..ee6b619ceeb 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -38,7 +38,7 @@
 
        	<menuitem action="action_hr_timesheet_analytic_profit"
         	id="menu_hr_timesheet_analytic_profit"
-        	parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/>
+        	parent="hr_timesheet.menu_hr_timesheet_reports" groups="base.group_extended" icon="STOCK_PRINT"/>
 
 	</data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 134bde8a872..bcae996a8ee 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -64,9 +64,7 @@ class account_analytic_line(osv.osv):
                 raise osv.except_osv(_('Analytic Account incomplete'),
                         _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
 
-            if not partner.address:
-                raise osv.except_osv(_('Partner incomplete'),
-                        _('Please fill in the Address field in the Partner: %s.') % (partner.name,))
+
 
             date_due = False
             if partner.property_payment_term:
@@ -81,10 +79,6 @@ class account_analytic_line(osv.osv):
             curr_invoice = {
                 'name': time.strftime('%d/%m/%Y')+' - '+account.name,
                 'partner_id': account.partner_id.id,
-                'address_contact_id': res_partner_obj.address_get(cr, uid,
-                    [account.partner_id.id], adr_pref=['contact'])['contact'],
-                'address_invoice_id': res_partner_obj.address_get(cr, uid,
-                    [account.partner_id.id], adr_pref=['invoice'])['invoice'],
                 'payment_term': partner.property_payment_term.id or False,
                 'account_id': partner.property_account_receivable.id,
                 'currency_id': account.pricelist_id.currency_id.id,
diff --git a/addons/html_view/html_view.xml b/addons/html_view/html_view.xml
index a279b408300..e29930a63ae 100644
--- a/addons/html_view/html_view.xml
+++ b/addons/html_view/html_view.xml
@@ -36,6 +36,6 @@
       <field name="res_model">html.view</field>
       <field name="view_type">form</field>
     </record>
-    <menuitem action="action_html_view_form" id="html_form" parent="base.menu_address_book" sequence="40"/>
+    <menuitem action="action_html_view_form" id="html_form" parent="base.menu_sales" sequence="40"/>
   </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 23667069b79..4ad479e763f 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -81,15 +81,6 @@
 
     <menuitem name="Ideas" parent="base.menu_tools" id="menu_ideas1" sequence="4"/>
 
-    <menuitem
-        name="Ideas by Categories" parent="menu_ideas1"
-        id="menu_idea_category_tree"
-        action="action_idea_category_tree"/>
-
-    <menuitem name="Give Vote" parent="menu_ideas1"
-        id="menu_give_vote"
-        action="action_idea_select"
-        groups="base.group_tool_user"/>
 
 
     <!-- Open Ideas Action  -->
@@ -384,10 +375,7 @@
     </record>
     <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager,base.group_tool_user"/>
 
-    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
-
-    <menuitem name="Vote Statistics" parent="menu_idea_reporting"
-        id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_user"/>
+    <menuitem name="Idea" parent="base.menu_reporting" id="menu_idea_reporting" sequence="65"/>
 
     <!-- Vote For Idea Action  -->
     <record model="ir.actions.act_window" id="action_idea_vote">
@@ -398,7 +386,6 @@
         <field name="search_view_id" ref="view_idea_vote_search"/>
     </record>
 
-    <menuitem name="Votes" parent="menu_ideas1" id="menu_idea_vote" action="action_idea_vote"/>
 
     </data>
 </openerp>
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 02a3cbdbdd8..b26bd2af0a9 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/import_base/i18n/fi.po b/addons/import_base/i18n/fi.po
new file mode 100644
index 00000000000..39e9dcd8fca
--- /dev/null
+++ b/addons/import_base/i18n/fi.po
@@ -0,0 +1,104 @@
+# Finnish 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-03-26 06:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-27 04:51+0000\n"
+"X-Generator: Launchpad (build 15011)\n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:434
+#, python-format
+msgid "Import failed due to an unexpected error"
+msgstr "Tuonti epäonnistui tuntemattoman virheen takia"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:461
+#, python-format
+msgid "started at %s and finished at %s \n"
+msgstr "aloitettu %s ja valmistui %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:448
+#, python-format
+msgid "Import of your data finished at %s"
+msgstr "Tietojen tuonti valmistui %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:463
+#, python-format
+msgid ""
+"but failed, in consequence no data were imported to keep database "
+"consistency \n"
+" error : \n"
+msgstr ""
+"mutta epäonnistui, tietojen yhtenäisyyden säilyttämiseksi tietoja ei tuotu \n"
+" virhe: \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:477
+#, python-format
+msgid ""
+"The import of data \n"
+" instance name : %s \n"
+msgstr ""
+"Tietojen tuonti \n"
+" Instanssin nimi: %s \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:470
+#, python-format
+msgid "%s has been successfully imported from %s %s, %s \n"
+msgstr "%s on onnistuneesti tuotu %s %s, %s :stä \n"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:447
+#, python-format
+msgid "Data Import failed at %s due to an unexpected error"
+msgstr "Tietojen tuonti epäonnistui %s:ssä tuntemattoman virheen takia"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:436
+#, python-format
+msgid "Import finished, notification email sended"
+msgstr "Tuonti valmis, muistutussähköposti on lähetety"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:190
+#, python-format
+msgid "%s is not a valid model name"
+msgstr "%s ei ole sallittu mallin nimi"
+
+#. module: import_base
+#: model:ir.ui.menu,name:import_base.menu_import_crm
+msgid "Import"
+msgstr "Tuo"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:467
+#, python-format
+msgid "with no warning"
+msgstr "ei varoituksia"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:469
+#, python-format
+msgid "with warning : %s"
+msgstr "varoituksella : %s"
+
+#. module: import_base
+#: code:addons/import_base/import_framework.py:191
+#, python-format
+msgid " fields imported : "
+msgstr " Tuodut kentät : "
diff --git a/addons/import_base/import_base_view.xml b/addons/import_base/import_base_view.xml
index 1368b50b6e4..8d4735be00a 100644
--- a/addons/import_base/import_base_view.xml
+++ b/addons/import_base/import_base_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-		<menuitem name="Import" id="menu_import_crm" parent="base.menu_base_partner"/>
+		<menuitem name="Import &amp; Synchronize" id="base.menu_import_crm" parent="base.menu_base_partner" sequence="6"/>
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/import_google/i18n/fr.po b/addons/import_google/i18n/fr.po
new file mode 100644
index 00000000000..387862ac118
--- /dev/null
+++ b/addons/import_google/i18n/fr.po
@@ -0,0 +1,219 @@
+# 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-03-21 18:30+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-03-22 04:57+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr "Fournisseur"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr "Options d'importation"
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr "Nom du groupe"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr "Catégorie de cas"
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr ""
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr ""
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr "Type de réunion"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Merci d'installer gdata-python-client à partir de "
+"http://code.google.com/p/gdata-python-client/downloads/list"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr "Contact Google"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr "synchronize.google.import"
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr "Erreur"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr "Avertissement !"
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr "Options"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Erreur lors de l'import des contacts Google !"
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr "Importer un message"
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr "Nom du calendrier"
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr ""
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner status for this group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr ""
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index b35e97645e7..4a5096c38a4 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -78,14 +78,14 @@
         </record>
 
         <menuitem id="menu_sync_contact"
-                  parent="base.menu_address_book"
+                  parent="base.menu_import_crm"
                   action="act_google_login_contact_form"
-                  sequence="40" />
+                  sequence="5" />
 
         <menuitem id="menu_sync_calendar"
-                  parent="crm.menu_meeting_sale"
+                  parent="base.menu_import_crm"
                   action="act_google_login_form"
-                  sequence="20" />
+                  sequence="15" />
 
     </data>
 </openerp>
diff --git a/addons/import_sugarcrm/i18n/nl.po b/addons/import_sugarcrm/i18n/nl.po
new file mode 100644
index 00000000000..efc8c3ce436
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/nl.po
@@ -0,0 +1,406 @@
+# Dutch 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-03-24 17:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-03-25 05:05+0000\n"
+"X-Generator: Launchpad (build 14981)\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 "Fout!"
+
+#. 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 "(Komt snel)"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,document:0
+msgid "Documents"
+msgstr "Documenten"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import your data from SugarCRM :"
+msgstr "Import uw gegevens van SugerCRM:"
+
+#. 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 "Contacten"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "HR"
+msgstr "HR"
+
+#. 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 "Instantienaam"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project_task:0
+msgid "Project Tasks"
+msgstr "Project taken"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_from:0
+msgid "Notify End Of Import To:"
+msgstr "Meld het einde van de import aan:"
+
+#. 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 "Werknemer"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Document"
+msgstr "Document"
+
+#. 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 "Import gegevens van SugarCRM"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr "Relatiebeheer"
+
+#. 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 "Gesprekken"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Multi Instance Management"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. 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 "E-mail en make notitie"
+
+#. 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 "Importeer SugarCRM"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr "_Importeren"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,user:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. 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 "Dossiers"
+
+#. 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 "Projecten"
+
+#. 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 "Select module om te importeren"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,meeting:0
+msgid "Meetings"
+msgstr "Afspraken"
+
+#. 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 "SugarSoap Api url:"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Address Book"
+msgstr "Adresboek"
+
+#. 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 ""
+"Authenticatie fout !\n"
+"Foutieve gebruikersnaam of wachtwoord of SugarSoap Api url !"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,bug:0
+msgid "Bugs"
+msgstr "Fouten/bugs"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Project"
+msgstr "Project"
+
+#. 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 "Leads & Pros."
+
+#. 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 "Fout !"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Warning !"
+msgstr "Waarschuwing !"
+
+#. 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 "Wachtwoord"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Login Information"
+msgstr "Aanmeldingsinformatie"
+
+#. 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 "E-mail melding als de import gereed is"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,username:0
+msgid "User Name"
+msgstr "Gebruikersnaam"
+
+#. module: import_sugarcrm
+#: view:import.message:0
+#: model:ir.model,name:import_sugarcrm.model_import_message
+msgid "Import Message"
+msgstr "Import bericht"
+
+#. 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 "Online documentatie:"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,account:0
+msgid "Accounts"
+msgstr "Accounts"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#. 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 "ZSI Import fout!"
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr "Importeer SugarCRM DATA"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr "E-mail adres voor melding"
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 3c1f9df60fb..f90451c69f5 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -98,7 +98,7 @@
     </record>
 
 
-    <menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="import_base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE"/>
+    <menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE" sequence="20"/>
 
   </data>
 </openerp>
diff --git a/addons/knowledge/i18n/sr@latin.po b/addons/knowledge/i18n/sr@latin.po
index 20d861ccb39..dffc871b7c9 100644
--- a/addons/knowledge/i18n/sr@latin.po
+++ b/addons/knowledge/i18n/sr@latin.po
@@ -8,24 +8,24 @@ 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: 2010-12-23 15:11+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-03-19 11:56+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\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 07:00+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-03-20 04:56+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr ""
+msgstr "Sadržaj saradnje"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
-msgstr "Konfiguracija"
+msgstr "Podešavanje"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index 560fdce0506..4871541b4c9 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -5,6 +5,7 @@
     <record id="base.group_document_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_knowledge_management"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/l10n_at/static/src/img/icon.png b/addons/l10n_at/static/src/img/icon.png
new file mode 100644
index 00000000000..cac568e4224
--- /dev/null
+++ b/addons/l10n_at/static/src/img/icon.png
diff --git a/addons/l10n_be/account_demo.xml b/addons/l10n_be/account_demo.xml
index 697d3c3cfef..88a59c75ab3 100644
--- a/addons/l10n_be/account_demo.xml
+++ b/addons/l10n_be/account_demo.xml
@@ -6,13 +6,12 @@
         <record id="invoice_1" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field name="partner_id" ref="base.res_partner_address_8"/>
         </record>
         <record id="invoice_1_line_1" model="account.invoice.line">
             <field name="name">Otpez Laptop without OS</field>
@@ -32,13 +31,12 @@
         <record id="invoice_2" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field name="partner_id" ref="base.res_partner_address_8"/>
             <field eval="time.strftime('%Y-%m') + '-01'" name="date_invoice"/>
         </record>
         <record id="invoice_2_line_1" model="account.invoice.line">
@@ -60,13 +58,12 @@
         <record id="invoice_3" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field name="partner_id" ref="base.res_partner_address_8"/>
             <field eval="time.strftime('%Y-%m') + '-08'" name="date_invoice"/>
         </record>
         <record id="invoice_3_line_1" model="account.invoice.line">
@@ -88,13 +85,12 @@
         <record id="invoice_4" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="state">draft</field>
             <field name="type">out_invoice</field>
             <field name="account_id" ref="a_recv"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field name="partner_id" ref="base.res_partner_address_8"/>
             <field eval="time.strftime('%Y-%m') + '-15'" name="date_invoice"/>
         </record>
         <record id="invoice_4_line_1" model="account.invoice.line">
diff --git a/addons/l10n_be/static/src/img/icon.png b/addons/l10n_be/static/src/img/icon.png
new file mode 100644
index 00000000000..2ee49b8c1a2
--- /dev/null
+++ b/addons/l10n_be/static/src/img/icon.png
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index e7eaa9434d0..eed2a537f62 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -94,18 +94,18 @@ class l10n_be_vat_declaration(osv.osv_memory):
         tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
         name = email = phone = address = post_code = city = country_code = ''
-        name, email, phone, city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id.address)
+        name, email, phone, city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id)
 
         account_period = obj_acc_period.browse(cr, uid, data['period_id'][0], context=context)
-        issued_by = vat_no[:2] 
+        issued_by = vat_no[:2]
         comments = data['comments'] or ''
-            
+
         send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
-        
+
         starting_month = account_period.date_start[5:7]
         ending_month = account_period.date_stop[5:7]
         quarter = str(((int(starting_month) - 1) / 3) + 1)
-    
+
         if not email:
             raise osv.except_osv(_('Data Insufficient!'),_('No email address associated with the company.'))
         if not phone:
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
index 37bfd034fae..68ad3f703e1 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -170,7 +170,6 @@ class partner_vat_list(osv.osv_memory):
         obj_sequence = self.pool.get('ir.sequence')
         obj_users = self.pool.get('res.users')
         obj_partner = self.pool.get('res.partner')
-        obj_addr = self.pool.get('res.partner.address')
         obj_model_data = self.pool.get('ir.model.data')
         seq_declarantnum = obj_sequence.get(cr, uid, 'declarantnum')
         obj_cmpny = obj_users.browse(cr, uid, uid, context=context).company_id
@@ -187,12 +186,12 @@ class partner_vat_list(osv.osv_memory):
         street = city = country = ''
         addr = obj_partner.address_get(cr, uid, [obj_cmpny.partner_id.id], ['invoice'])
         if addr.get('invoice',False):
-            ads = obj_addr.browse(cr, uid, [addr['invoice']], context=context)[0]
+            ads = obj_partner.browse(cr, uid, [addr['invoice']], context=context)[0]
             phone = ads.phone.replace(' ','') or ''
             email = ads.email or ''
             name = ads.name or ''
-            city = obj_addr.get_city(cr, uid, ads.id)
-            zip = obj_addr.browse(cr, uid, ads.id, context=context).zip or ''
+            city = obj_partner.get_city(cr, uid, ads.id)
+            zip = obj_partner.browse(cr, uid, ads.id, context=context).zip or ''
             if not city:
                 city = ''
             if ads.street:
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index f784d3953e8..123d235f19b 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -92,7 +92,6 @@ class partner_vat_intra(osv.osv_memory):
         obj_user = self.pool.get('res.users')
         obj_sequence = self.pool.get('ir.sequence')
         obj_partner = self.pool.get('res.partner')
-        obj_partner_add = self.pool.get('res.partner.address')
 
         xmldict = {}
         post_code = street = city = country = data_clientinfo = ''
@@ -131,7 +130,7 @@ class partner_vat_intra(osv.osv_memory):
         phone = data_company.partner_id.phone or ''
 
         if addr.get('invoice',False):
-            ads = obj_partner_add.browse(cr, uid, [addr['invoice']])[0]
+            ads = obj_partner.browse(cr, uid, [addr['invoice']])[0]
             city = (ads.city or '')
             post_code = (ads.zip or '')
             if ads.street:
diff --git a/addons/l10n_be_invoice_bba/i18n/sr@latin.po b/addons/l10n_be_invoice_bba/i18n/sr@latin.po
new file mode 100644
index 00000000000..270c6c43fb6
--- /dev/null
+++ b/addons/l10n_be_invoice_bba/i18n/sr@latin.po
@@ -0,0 +1,154 @@
+# Serbian Latin 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-03-19 12:08+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\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-03-20 04:56+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
+
+#. module: l10n_be_invoice_bba
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Broj fakture mora biti jedinstven po kompaniji"
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: l10n_be_invoice_bba
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Greška ! Ne možete praviti rekurzivne povezane članove."
+
+#. module: l10n_be_invoice_bba
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Nepravilno BBA struktuirana komunikacija !"
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Random"
+msgstr "Nasumično"
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_type:0
+msgid "Select Default Communication Type for Outgoing Invoices."
+msgstr "Izaberi tip komunikacije po default-u za izlazne fakture."
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_algorithm:0
+msgid ""
+"Select Algorithm to generate the Structured Communication on Outgoing "
+"Invoices."
+msgstr ""
+"Izaberi algoritam za generisanje struktuirane komunkiacije za izlazne račune."
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:114
+#: code:addons/l10n_be_invoice_bba/invoice.py:140
+#, python-format
+msgid ""
+"The daily maximum of outgoing invoices with an automatically generated BBA "
+"Structured Communications has been exceeded!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+"Dnevni maksimum izlaznih faktura sa automatski generisanim BBA struktuiranim "
+"komunikacijama je pređen!\n"
+"Molimo da ručno napravite jedinstvenu BBA struktuiranu komunikaciju"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:155
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:126
+#, python-format
+msgid ""
+"The Partner should have a 3-7 digit Reference Number for the generation of "
+"BBA Structured Communications!\n"
+"Please correct the Partner record."
+msgstr ""
+"Partner bi trebalo da ima referentni broj od 3 do 7 cifara za generisanje "
+"BBA struktuirane komunikacije!\n"
+"Molimo ispravite zapis o partneru."
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:113
+#: code:addons/l10n_be_invoice_bba/invoice.py:125
+#: code:addons/l10n_be_invoice_bba/invoice.py:139
+#: code:addons/l10n_be_invoice_bba/invoice.py:167
+#: code:addons/l10n_be_invoice_bba/invoice.py:177
+#: code:addons/l10n_be_invoice_bba/invoice.py:202
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje!"
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Customer Reference"
+msgstr "Referentni broj potrošača"
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_type:0
+msgid "Communication Type"
+msgstr "Tip komunikacije"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:178
+#: code:addons/l10n_be_invoice_bba/invoice.py:203
+#, python-format
+msgid ""
+"The BBA Structured Communication has already been used!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+"BBA struktuirana komunikacija je već upotrebljena!\n"
+"Molimo ručno napravite jedinstvenu BBA struktuiranu komunikaciju."
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:156
+#, python-format
+msgid ""
+"Unsupported Structured Communication Type Algorithm '%s' !\n"
+"Please contact your OpenERP support channel."
+msgstr ""
+"Nepodržan algoritam BBA struktuirane komunikacije  '%s' !\n"
+"Molimo kontaktirajte OpenERP-ovu podršku."
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_algorithm:0
+msgid "Communication Algorithm"
+msgstr "Algoritam komunikacije"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:168
+#, python-format
+msgid ""
+"Empty BBA Structured Communication!\n"
+"Please fill in a unique BBA Structured Communication."
+msgstr ""
+"Prazna BBA struktuirana komunikacija!\n"
+"Molimo unesite jedinstvenu BBA struktuiranu komunikaciju."
diff --git a/addons/l10n_br/l10n_br_view.xml b/addons/l10n_br/l10n_br_view.xml
index 361f52746ce..27a6f7f710e 100644
--- a/addons/l10n_br/l10n_br_view.xml
+++ b/addons/l10n_br/l10n_br_view.xml
@@ -74,7 +74,7 @@
 		
 		<menuitem name="Tax Situation Code Template" id="menu_action_l10n_br_cst_template" sequence="99" parent="account.account_template_taxes" action="action_l10n_br_cst_template_form"/>
 		
-		<menuitem name="Tax Situation Code" id="menu_action_l10n_br_cst" parent="account.next_id_27" sequence="99" action="action_l10n_br_cst_form"/>
+		<menuitem name="Tax Situation Code" id="menu_action_l10n_br_cst" parent="account.next_id_27" sequence="99" action="action_l10n_br_cst_form" groups="base.group_no_one"/>
 		
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_br/static/src/img/icon.png b/addons/l10n_br/static/src/img/icon.png
new file mode 100644
index 00000000000..d00cbc2de18
--- /dev/null
+++ b/addons/l10n_br/static/src/img/icon.png
diff --git a/addons/l10n_ca/static/src/img/icon.png b/addons/l10n_ca/static/src/img/icon.png
new file mode 100644
index 00000000000..ab85ec08cad
--- /dev/null
+++ b/addons/l10n_ca/static/src/img/icon.png
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index 2ede389d7e1..9c994d8035e 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -153,13 +153,13 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="before">
+                <xpath expr="//page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="before">
                     <field name="state" />
-                    <field name="bank" /> 
+                    <field name="bank" />
                 </xpath>
             </field>
         </record>
-        
+
         <!-- res.partner form bank list-->
         <!-- Adding Type and bank name -->
         <record id="l10nch_view_partner_bank_invoice_tree" model="ir.ui.view">
diff --git a/addons/l10n_ch/demo/demo.xml b/addons/l10n_ch/demo/demo.xml
index f13546150b3..aeb8b9eafd7 100644
--- a/addons/l10n_ch/demo/demo.xml
+++ b/addons/l10n_ch/demo/demo.xml
@@ -24,12 +24,12 @@
                 <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
         </record>
         
-        <record id="res_partner_address_bank1" model="res.partner.address">
+        <record id="res_partner_address_bank1" model="res.partner">
             <field name="fax">+41 31 622 13 00</field>
             <field name="name">Marc Dufour</field>
             <field name="zip">1015</field>
             <field name="city">Lausanne</field>
-            <field name="partner_id" ref="bank"/>
+            <field name="parent_id" ref="bank"/>
             <field name="country_id" model="res.country" search="[('code','=','ch')]"/>
             <field name="email">openerp@bank.com</field>
             <field name="phone">+41 24 620 10 12</field>
@@ -56,15 +56,15 @@
             <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/>
         </record>
                 <!--
-                Resource: res.partner.address
+                Resource: res.partner
                 -->
 
-        <record id="res_partner_address_1" model="res.partner.address">
+        <record id="res_partner_address_1" model="res.partner">
             <field name="fax">+41 21 619 10 00</field>
             <field name="name">Luc Maurer</field>
             <field name="zip">1015</field>
             <field name="city">Lausanne</field>
-            <field name="partner_id" ref="camptocamp"/>
+            <field name="parent_id" ref="camptocamp"/>
             <field name="country_id" model="res.country" search="[('code','=','ch')]"/>
             <field name="email">openerp@camptocamp.com</field>
             <field name="phone">+41 21 619 10 12</field>
@@ -72,11 +72,11 @@
             <field name="active">1</field>
             <field name="type">default</field>
         </record>
-        <record id="res_partner_address_2" model="res.partner.address">
+        <record id="res_partner_address_2" model="res.partner">
             <field name="name">Ferdinand Gassauer</field>
             <field name="zip">1015</field>
             <field name="city">Lausanne</field>
-            <field name="partner_id" ref="prolibre"/>
+            <field name="parent_id" ref="prolibre"/>
             <field name="country_id" model="res.country" search="[('code','=','ch')]"/>
             <field name="email">info@camptocamp.com</field>
             <field name="phone">+41 21 619 10 11</field>
@@ -84,12 +84,12 @@
             <field name="active">1</field>
             <field name="type">default</field>
         </record>
-        <record id="res_partner_address_3" model="res.partner.address">
+        <record id="res_partner_address_3" model="res.partner">
             <field name="fax">+41 21 619 10 00</field>
             <field name="name">Claude Philipona</field>
             <field name="zip">1015</field>
             <field name="city">Lausanne</field>
-            <field name="partner_id" ref="camptocamp"/>
+            <field name="parent_id" ref="camptocamp"/>
             <field name="country_id" model="res.country" search="[('name','=','Switzerland')]"/>
             <field name="email">openerp@camptocamp.com</field>
             <field name="phone">+41 21 619 10 12 </field>
diff --git a/addons/l10n_ch/demo/dta_demo.xml b/addons/l10n_ch/demo/dta_demo.xml
index 4f44ad21cc0..5aa00b9c505 100644
--- a/addons/l10n_ch/demo/dta_demo.xml
+++ b/addons/l10n_ch/demo/dta_demo.xml
@@ -33,7 +33,6 @@
         <field name="amount_total">54150</field>
         <field name="number">1</field>
         <field name="partner_id" ref="base.res_partner_agrolait"/>
-        <field name="address_invoice_id" ref="base.res_partner_address_8"/>
         <field name="account_id" ref="account.a_recv"/>
         <field name="currency_id" ref="base.EUR"/>
         <field name="company_id" ref="base.main_partner"/>
diff --git a/addons/l10n_ch/report/bvr.mako b/addons/l10n_ch/report/bvr.mako
index e4a2a2ea87d..96d94bedc6e 100644
--- a/addons/l10n_ch/report/bvr.mako
+++ b/addons/l10n_ch/report/bvr.mako
@@ -103,20 +103,20 @@
        <!--adresses + info block -->
             <table class="dest_address"  style="position:absolute;top:6mm;left:15mm">
                <tr><td ><b>${inv.partner_id.title.name or ''|entity}  ${inv.partner_id.name |entity}</b></td></tr>
-               <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr>
-               <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr>
-               <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr>
-               %if inv.address_invoice_id.country_id :
-               <tr><td>${inv.address_invoice_id.country_id.name or ''|entity} </td></tr>
+               <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
+               <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
+               <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
+               %if inv.partner_id.country_id :
+               <tr><td>${inv.partner_id.country_id.name or ''|entity} </td></tr>
                %endif
-               %if inv.address_invoice_id.phone :
-               <tr><td>${_("Tel") |entity}: ${inv.address_invoice_id.phone|entity}</td></tr>
+               %if inv.partner_id.phone :
+               <tr><td>${_("Tel") |entity}: ${inv.partner_id.phone|entity}</td></tr>
                %endif
-               %if inv.address_invoice_id.fax :
-               <tr><td>${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity}</td></tr>
+               %if inv.partner_id.fax :
+               <tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr>
                %endif
-               %if inv.address_invoice_id.email :
-               <tr><td>${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity}</td></tr>
+               %if inv.partner_id.email :
+               <tr><td>${_("E-mail") |entity}: ${inv.partner_id.email|entity}</td></tr>
                %endif
                %if inv.partner_id.vat :
                <tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr>
@@ -142,7 +142,7 @@
     <table name="bvrframe"  id="${inv.id}" style="width:210mm;height:106mm;border-collapse:collapse;padding-left:3mm;font-family:Helvetica;font-size:8pt;border-width:0px" border="0" CELLPADDING="0" CELLSPACING="0"> <!--border-width:1px;border-style:solid;border-color:black;-->
         <tr style="height:16.933333mm;vertical-align:bottom;padding-bottom:3mm"><td style="width:60.14mm;padding-bottom:3mm"><div style="padding-left:3mm;">${inv.partner_bank_id and inv.partner_bank_id.print_bank and inv.partner_bank_id.bank and inv.partner_bank_id.bank.name or ''}</div></td><td style="width:60.96mm;padding-bottom:3mm"><div style="padding-left:3mm;">${inv.partner_bank_id and inv.partner_bank_id.print_bank and inv.partner_bank_id.bank and inv.partner_bank_id.bank.name or ''}</div></td><td style="width:88.9mm"></td></tr>
         <tr style="height:12.7mm;vertical-align:bottom;padding-bottom:3mm"><td style="width:60.14mm;padding-bottom:3mm"><div style="padding-left:3mm;"><b>${user.company_id.partner_id.name}</b></div></td><td style="width:60.96mm;padding-bottom:3mm"><div style="padding-left:3mm;"><b>${user.company_id.partner_id.name}</b></div></td><td style="width:88.9mm"></td></tr>
-        <tr style="height:16.933333mm;vertical-align:bottom;padding-bottom:0"><td><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.address[0].street}<br/> ${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="padding-left:3mm"><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.address[0].street}<br/>${user.company_id.partner_id.address[0].zip} ${user.company_id.partner_id.address[0].city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="text-align: right;padding-right:4mm;padding-bottom:8mm;font-size:11pt">${_space(_get_ref(inv))}</td></tr>
+        <tr style="height:16.933333mm;vertical-align:bottom;padding-bottom:0"><td><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.street}<br/> ${user.company_id.partner_id.zip} ${user.company_id.partner_id.city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="padding-left:3mm"><table style="padding-left:3mm;font-family:Helvetica;font-size:8pt" height="100%"><tr style="vertical-align:top;padding-bottom:0"><td>${user.company_id.partner_id.street}<br/>${user.company_id.partner_id.zip} ${user.company_id.partner_id.city}</td></tr><tr style="vertical-align:bottom;padding-bottom:0"><td><div style="padding-left:30.48mm;">${inv.partner_bank_id.print_account and inv.partner_bank_id.post_number or ''}</div></td></tr></table></td><td style="text-align: right;padding-right:4mm;padding-bottom:8mm;font-size:11pt">${_space(_get_ref(inv))}</td></tr>
         <tr style="height:8.4666667mm;vertical-align:bottom;padding-bottom:0"> <td><table  style="width:100%" CELLPADDING="0" CELLSPACING="0"><td  style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td><table  style="width:100%" CELLPADDING="0" CELLSPACING="0"><td  style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td></td></tr>
         <tr style="height:21.166667mm"><td></td><td></td><td></td></tr>
         <tr style="height:8.4666667mm"> <td></td><td></td><td></td></tr>
diff --git a/addons/l10n_ch/report/report_webkit_html.mako b/addons/l10n_ch/report/report_webkit_html.mako
index 099bbbf8816..369799c0d44 100644
--- a/addons/l10n_ch/report/report_webkit_html.mako
+++ b/addons/l10n_ch/report/report_webkit_html.mako
@@ -10,20 +10,20 @@
        <div id="inv_cont_${inv.id}" style="padding-left:20mm;padding-top:0;padding-bottom:10;border-width:0px;border-style:solid">
        <table class="dest_address">
            <tr><td ><b>${inv.partner_id.title.name or ''|entity}  ${inv.partner_id.name |entity}</b></td></tr>
-           <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr>
-           <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr>
-           <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr>
-           %if inv.address_invoice_id.country_id :
-           <tr><td>${inv.address_invoice_id.country_id.name or ''|entity} </td></tr>
+           <tr><td>${inv.partner_id.street or ''|entity}</td></tr>
+           <tr><td>${inv.partner_id.street2 or ''|entity}</td></tr>
+           <tr><td>${inv.partner_id.zip or ''|entity} ${inv.partner_id.city or ''|entity}</td></tr>
+           %if inv.partner_id.country_id :
+           <tr><td>${inv.partner_id.country_id.name or ''|entity} </td></tr>
            %endif
-           %if inv.address_invoice_id.phone :
-           <tr><td>${_("Tel") |entity}: ${inv.address_invoice_id.phone|entity}</td></tr>
+           %if inv.partner_id.phone :
+           <tr><td>${_("Tel") |entity}: ${inv.partner_id.phone|entity}</td></tr>
            %endif
-           %if inv.address_invoice_id.fax :
-           <tr><td>${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity}</td></tr>
+           %if inv.partner_id.fax :
+           <tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr>
            %endif
-           %if inv.address_invoice_id.email :
-           <tr><td>${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity}</td></tr>
+           %if inv.partner_id.email :
+           <tr><td>${_("E-mail") |entity}: ${inv.partner_id.email|entity}</td></tr>
            %endif
            %if inv.partner_id.vat :
            <tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr>
diff --git a/addons/l10n_ch/report/report_webkit_html_view.xml b/addons/l10n_ch/report/report_webkit_html_view.xml
index c1638ff99db..19f73715f98 100644
--- a/addons/l10n_ch/report/report_webkit_html_view.xml
+++ b/addons/l10n_ch/report/report_webkit_html_view.xml
@@ -36,16 +36,16 @@
                             <td><b>${company.partner_id.name |entity}</b></td><td></td><td></td>
                         </tr>
                         <tr>
-                            <td>${company.partner_id.address and company.partner_id.address[0].street or ''|entity}</td><td>${_("phone")}:</td><td>${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} </td><td></td>
+                            <td>${company.partner_id and company.partner_id.street or ''|entity}</td><td>${_("phone")}:</td><td>${company.partner_id and company.partner_id.phone or ''|entity} </td><td></td>
                         </tr>
                         <tr>
-                            <td>${company.partner_id.address and company.partner_id.address[0].street2 or ''|entity}</td><td>${_('Fax')}:</td><td>${company.partner_id.address and company.partner_id.address[0].fax or ''|entity} </td><td></td>
+                            <td>${company.partner_id and company.partner_id.street2 or ''|entity}</td><td>${_('Fax')}:</td><td>${company.partner_id and company.partner_id.fax or ''|entity} </td><td></td>
                         </tr>
                         <tr>
-                            <td>${company.partner_id.address and company.partner_id.address[0].zip or ''|entity} ${company.partner_id.address and company.partner_id.address[0].city or ''|entity}</td><td>${_('e-mail')}:</td><td><a href="mailto:${company.partner_id.address and company.partner_id.address[0].email or ''|entity}">${company.partner_id.address and company.partner_id.address[0].email or ''|entity}</a></td><td></td>
+                            <td>${company.partner_id and company.partner_id.zip or ''|entity} ${company.partner_id and company.partner_id.city or ''|entity}</td><td>${_('e-mail')}:</td><td><a href="mailto:${company.partner_id and company.partner_id.email or ''|entity}">${company.partner_id and company.partner_id.email or ''|entity}</a></td><td></td>
                         </tr>
                         <tr>
-                            <td>${company.partner_id.address and company.partner_id.address[0].country_id.name or ''|entity}</td><td></td><td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td>
+                            <td>${company.partner_id and company.partner_id.country_id.name or ''|entity}</td><td></td><td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td>
                         </tr>
                     </table> 
                 </td>
diff --git a/addons/l10n_ch/static/src/img/icon.png b/addons/l10n_ch/static/src/img/icon.png
new file mode 100644
index 00000000000..c59e295f733
--- /dev/null
+++ b/addons/l10n_ch/static/src/img/icon.png
diff --git a/addons/l10n_ch/test/l10n_ch_dta.yml b/addons/l10n_ch/test/l10n_ch_dta.yml
index e82af1c7b72..c79ec55adb8 100644
--- a/addons/l10n_ch/test/l10n_ch_dta.yml
+++ b/addons/l10n_ch/test/l10n_ch_dta.yml
@@ -13,8 +13,6 @@
     account_id: account.a_pay
     type : in_invoice
     partner_id: base.res_partner_agrolait
-    address_contact_id: base.res_partner_address_8
-    address_invoice_id: base.res_partner_address_8
     reference_type: bvr
     reference: 11111111111111111111 
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml
index f120b14f33b..07a139761e9 100644
--- a/addons/l10n_ch/test/l10n_ch_report.yml
+++ b/addons/l10n_ch/test/l10n_ch_report.yml
@@ -1,34 +1,34 @@
-- 
+-
   In order to test BVR printing. I create Partner data .
-- 
+-
   !record {model: res.partner.category, id: res_partner_category_bvr}:
     name: Customers
 -
   I create BVR DUMMY Customer.
-- 
+-
   !record {model: res.partner, id: res_partner_bvr}:
     category_id:
       - res_partner_category_bvr
     name: BVR DUMMY
-- 
+-
   I create contact address for BVR DUMMY.
-- 
-  !record {model: res.partner.address, id: res_partner_address_1}:
-    partner_id: res_partner_bvr
+-
+  !record {model: res.partner, id: res_partner_address_1}:
+    parent_id: res_partner_bvr
     street: Route de Bélario
     type: contact
-- 
+-
   I create invoice address for BVR DUMMY.
-- 
-  !record {model: res.partner.address, id: res_partner_address_2}:
-    partner_id: res_partner_bvr
+-
+  !record {model: res.partner, id: res_partner_address_2}:
+    parent_id: res_partner_bvr
     street: Route de Bélario
     type: invoice
-- 
+-
   I create delivery address for BVR DUMMY.
-- 
-  !record {model: res.partner.address, id: res_partner_address_3}:
-    partner_id: res_partner_bvr
+-
+  !record {model: res.partner, id: res_partner_address_3}:
+    parent_id: res_partner_bvr
     street: Route de Bélario
     type: delivery
 
@@ -38,13 +38,11 @@
   !record {model: account.invoice, id: l10n_ch_invoice, view: False}:
     currency_id: base.CHF
     company_id: base.main_company
-    address_invoice_id: res_partner_address_2
     partner_id: res_partner_bvr
     state: draft
     type: out_invoice
     account_id: account.a_recv
     name: BVR test invoice
-    address_contact_id: res_partner_address_1
 
 -
   In order to test the BVR report, I will assign a bank to the invoice
diff --git a/addons/l10n_ch/test/l10n_ch_v11.yml b/addons/l10n_ch/test/l10n_ch_v11.yml
index e30012dd6b8..4bc7ce1097b 100644
--- a/addons/l10n_ch/test/l10n_ch_v11.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11.yml
@@ -13,8 +13,6 @@
     account_id: account.a_recv
     type : out_invoice
     partner_id: base.res_partner_agrolait
-    address_contact_id: base.res_partner_address_8
-    address_invoice_id: base.res_partner_address_8
     reference_type: bvr
     reference: 12345676
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
diff --git a/addons/l10n_ch/test/l10n_ch_v11_part.yml b/addons/l10n_ch/test/l10n_ch_v11_part.yml
index af726ae97ea..71b16455f81 100644
--- a/addons/l10n_ch/test/l10n_ch_v11_part.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11_part.yml
@@ -14,8 +14,6 @@
     account_id: account.a_recv
     type : out_invoice
     partner_id: base.res_partner_agrolait
-    address_contact_id: base.res_partner_address_8
-    address_invoice_id: base.res_partner_address_8
     reference_type: bvr
     reference: 20009997
     date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py
index e9b0585d4c8..836853fa4fa 100644
--- a/addons/l10n_ch/wizard/create_dta.py
+++ b/addons/l10n_ch/wizard/create_dta.py
@@ -388,7 +388,7 @@ def _create_dta(obj, cr, uid, data, context=None):
     user = pool.get('res.users').browse(cr,uid,[uid])[0]
     company = user.company_id
     #XXX dirty code use get_addr
-    co_addr = company.partner_id.address[0]
+    co_addr = company.partner_id
     v['comp_country'] = co_addr.country_id and co_addr.country_id.name or ''
     v['comp_street'] = co_addr.street or ''
     v['comp_zip'] = co_addr.zip
@@ -479,20 +479,19 @@ def _create_dta(obj, cr, uid, data, context=None):
         else:
             v['partner_name'] = pline.partner_id and pline.partner_id.name or ''
 
-        if pline.partner_id and pline.partner_id.address \
-                and pline.partner_id.address[0]:
-            v['partner_street'] = pline.partner_id.address[0].street
-            v['partner_city'] = pline.partner_id.address[0].city
-            v['partner_zip'] = pline.partner_id.address[0].zip
+        if pline.partner_id and pline.partner_id:
+            v['partner_street'] = pline.partner_id.street
+            v['partner_city'] = pline.partner_id.city
+            v['partner_zip'] = pline.partner_id.zip
             # If iban => country=country code for space reason
             elec_pay = pline.bank_id.state #Bank type
             if elec_pay == 'iban':
-                v['partner_country']= pline.partner_id.address[0].country_id \
-                        and pline.partner_id.address[0].country_id.code+'-' \
+                v['partner_country']= pline.partner_id.country_id \
+                        and pline.partner_id.country_id.code+'-' \
                         or ''
             else:
-                v['partner_country']= pline.partner_id.address[0].country_id \
-                        and pline.partner_id.address[0].country_id.name \
+                v['partner_country']= pline.partner_id.country_id \
+                        and pline.partner_id.country_id.name \
                         or ''
         else:
             v['partner_street'] =''
diff --git a/addons/l10n_cn/i18n/zh_CN.po b/addons/l10n_cn/i18n/zh_CN.po
new file mode 100644
index 00000000000..2e0b504aab5
--- /dev/null
+++ b/addons/l10n_cn/i18n/zh_CN.po
@@ -0,0 +1,60 @@
+# Chinese (Simplified) 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: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-03-20 02:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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-03-21 05:00+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
+msgid "损益类"
+msgstr "损益类"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_all
+msgid "所有科目"
+msgstr "所有科目"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_equity
+msgid "所有者权益类"
+msgstr "所有者权益类"
+
+#. module: l10n_cn
+#: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_debt
+msgid "负债类"
+msgstr "负债类"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_cost
+msgid "成本类"
+msgstr "成本类"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_capital
+msgid "资产类"
+msgstr "资产类"
diff --git a/addons/l10n_cn/static/src/img/icon.png b/addons/l10n_cn/static/src/img/icon.png
new file mode 100644
index 00000000000..9f8b4655632
--- /dev/null
+++ b/addons/l10n_cn/static/src/img/icon.png
diff --git a/addons/l10n_cr/static/src/img/icon.png b/addons/l10n_cr/static/src/img/icon.png
new file mode 100644
index 00000000000..832f576e77e
--- /dev/null
+++ b/addons/l10n_cr/static/src/img/icon.png
diff --git a/addons/l10n_de/static/src/img/icon.png b/addons/l10n_de/static/src/img/icon.png
new file mode 100644
index 00000000000..e5814496231
--- /dev/null
+++ b/addons/l10n_de/static/src/img/icon.png
diff --git a/addons/l10n_ec/static/src/img/icon.png b/addons/l10n_ec/static/src/img/icon.png
new file mode 100644
index 00000000000..ae49151db1e
--- /dev/null
+++ b/addons/l10n_ec/static/src/img/icon.png
diff --git a/addons/l10n_es/static/src/img/icon.png b/addons/l10n_es/static/src/img/icon.png
new file mode 100644
index 00000000000..d7f101e8ca3
--- /dev/null
+++ b/addons/l10n_es/static/src/img/icon.png
diff --git a/addons/l10n_fr/static/src/img/icon.png b/addons/l10n_fr/static/src/img/icon.png
new file mode 100644
index 00000000000..bbcaa4fcce7
--- /dev/null
+++ b/addons/l10n_fr/static/src/img/icon.png
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index b974df2e999..38c51df58e0 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/notebook/page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
+                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
                         <newline />
                         <field name="bank_code" />
                         <field name="office" />
@@ -17,7 +17,7 @@
                         <field name="key" />
                         <newline />
                     </xpath>
-                    <xpath expr="/form/notebook/page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+                    <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
                         <field name="rib_acc_number"/>
                     </xpath>
                 </data>
diff --git a/addons/l10n_gr/static/src/img/icon.png b/addons/l10n_gr/static/src/img/icon.png
new file mode 100644
index 00000000000..3267e7c6f39
--- /dev/null
+++ b/addons/l10n_gr/static/src/img/icon.png
diff --git a/addons/l10n_gt/static/src/img/icon.png b/addons/l10n_gt/static/src/img/icon.png
new file mode 100644
index 00000000000..94edcd1eabe
--- /dev/null
+++ b/addons/l10n_gt/static/src/img/icon.png
diff --git a/addons/l10n_hn/static/src/img/icon.png b/addons/l10n_hn/static/src/img/icon.png
new file mode 100644
index 00000000000..cd2e26ad427
--- /dev/null
+++ b/addons/l10n_hn/static/src/img/icon.png
diff --git a/addons/l10n_in/static/src/img/icon.png b/addons/l10n_in/static/src/img/icon.png
new file mode 100644
index 00000000000..ddaf38f8b6d
--- /dev/null
+++ b/addons/l10n_in/static/src/img/icon.png
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index edc453f8ba0..96f3b3510ff 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -9,7 +9,7 @@
 #    Domsense srl
 #    Albatos srl
 #
-#    Copyright (C) 2011
+#    Copyright (C) 2011-2012
 #    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -44,7 +44,6 @@ Italian accounting chart and localization.
     'init_xml': [
         ],
     'update_xml': [
-        'data/account.account.type.csv',
         'data/account.account.template.csv',
         'data/account.tax.code.template.csv',
         'account_chart.xml',
diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv
index 47ae1388233..b06a3fe8574 100644
--- a/addons/l10n_it/data/account.account.template.csv
+++ b/addons/l10n_it/data/account.account.template.csv
@@ -1,235 +1,235 @@
 id,code,name,parent_id:id,user_type:id,type,reconcile
-0,0,Azienda,,account_type_view,view,FALSE
-1,1,ATTIVO ,0,account_type_view,view,TRUE
-11,11,IMMOBILIZZAZIONI IMMATERIALI ,1,account_type_view,view,TRUE
-1101,1101,costi di impianto ,11,account_type_asset,other,TRUE
-1106,1106,software ,11,account_type_asset,other,TRUE
-1108,1108,avviamento ,11,account_type_asset,other,TRUE
-1111,1111,fondo ammortamento costi di impianto ,11,account_type_asset,other,TRUE
-1116,1116,fondo ammortamento software ,11,account_type_asset,other,TRUE
-1118,1118,fondo ammortamento avviamento ,11,account_type_asset,other,TRUE
-12,12,IMMOBILIZZAZIONI MATERIALI ,1,account_type_view,view,TRUE
-1201,1201,fabbricati ,12,account_type_asset,other,TRUE
-1202,1202,impianti e macchinari ,12,account_type_asset,other,TRUE
-1204,1204,attrezzature commerciali ,12,account_type_asset,other,TRUE
-1205,1205,macchine d'ufficio ,12,account_type_asset,other,TRUE
-1206,1206,arredamento ,12,account_type_asset,other,TRUE
-1207,1207,automezzi ,12,account_type_asset,other,TRUE
-1208,1208,imballaggi durevoli ,12,account_type_asset,other,TRUE
-1211,1211,fondo ammortamento fabbricati ,12,account_type_asset,other,TRUE
-1212,1212,fondo ammortamento impianti e macchinari ,12,account_type_asset,other,TRUE
-1214,1214,fondo ammortamento attrezzature commerciali ,12,account_type_asset,other,TRUE
-1215,1215,fondo ammortamento macchine d'ufficio ,12,account_type_asset,other,TRUE
-1216,1216,fondo ammortamento arredamento ,12,account_type_asset,other,TRUE
-1217,1217,fondo ammortamento automezzi ,12,account_type_asset,other,TRUE
-1218,1218,fondo ammortamento imballaggi durevoli ,12,account_type_asset,other,TRUE
-1220,1220,fornitori immobilizzazioni c/acconti ,12,account_type_asset,other,TRUE
-13,13,IMMOBILIZZAZIONI FINANZIARIE ,1,account_type_view,view,TRUE
-1301,1301,mutui attivi ,13,account_type_asset,other,TRUE
-14,14,RIMANENZE ,1,account_type_view,view,TRUE
-1401,1401,materie di consumo ,14,account_type_asset,other,TRUE
-1404,1404,merci ,14,account_type_asset,other,TRUE
-1410,1410,fornitori c/acconti ,14,account_type_asset,other,TRUE
-15,15,CREDITI COMMERCIALI ,1,account_type_view,view,TRUE
-1501,1501,crediti v/clienti ,15,account_type_receivable,receivable,TRUE
-1502,1502,crediti commerciali diversi ,15,account_type_receivable,other,TRUE
-1503,1503,clienti c/spese anticipate ,15,account_type_receivable,receivable,TRUE
-1505,1505,cambiali attive ,15,account_type_receivable,other,TRUE
-1506,1506,cambiali allo sconto ,15,account_type_receivable,other,TRUE
-1507,1507,cambiali all'incasso ,15,account_type_receivable,other,TRUE
-1509,1509,fatture da emettere ,15,account_type_receivable,other,TRUE
-1510,1510,crediti insoluti ,15,account_type_receivable,other,TRUE
-1511,1511,cambiali insolute ,15,account_type_receivable,other,TRUE
-1531,1531,crediti da liquidare ,15,account_type_receivable,other,TRUE
-1540,1540,fondo svalutazione crediti ,15,account_type_receivable,other,TRUE
-1541,1541,fondo rischi su crediti ,15,account_type_receivable,other,TRUE
-16,16,CREDITI DIVERSI ,1,account_type_view,view,TRUE
-1601,1601,IVA n/credito ,16,account_type_tax,other,TRUE
-1602,1602,IVA c/acconto ,16,account_type_tax,other,TRUE
-1605,1605,crediti per IVA ,16,account_type_tax,other,TRUE
-1607,1607,imposte c/acconto ,16,account_type_tax,other,TRUE
-1608,1608,crediti per imposte ,16,account_type_tax,other,TRUE
-1609,1609,crediti per ritenute subite ,16,account_type_asset,other,TRUE
-1610,1610,crediti per cauzioni ,16,account_type_asset,other,TRUE
-1620,1620,personale c/acconti ,16,account_type_asset,other,TRUE
-1630,1630,crediti v/istituti previdenziali ,16,account_type_asset,other,TRUE
-1640,1640,debitori diversi ,16,account_type_receivable,receivable,TRUE
-18,18,DISPONIBILITÀ LIQUIDE ,1,account_type_view,view,TRUE
-1801,1801,banche c/c ,18,account_type_bank,liquidity,TRUE
-1810,1810,c/c postali ,18,account_type_cash,liquidity,TRUE
-1820,1820,denaro in cassa ,18,account_type_cash,liquidity,TRUE
-1821,1821,assegni ,18,account_type_cash,liquidity,TRUE
-1822,1822,valori bollati ,18,account_type_cash,liquidity,TRUE
-19,19,RATEI E RISCONTI ATTIVI ,1,account_type_view,view,TRUE
-1901,1901,ratei attivi ,19,account_type_asset,other,TRUE
-1902,1902,risconti attivi ,19,account_type_asset,other,TRUE
-2,2,PASSIVO ,0,account_type_view,view,TRUE
-20,20,PATRIMONIO NETTO ,2,account_type_view,view,TRUE
-2101,2101,patrimonio netto ,20,account_type_asset,other,TRUE
-2102,2102,utile d'esercizio ,20,account_type_asset,other,TRUE
-2103,2103,perdita d'esercizio ,20,account_type_asset,other,TRUE
-2104,2104,prelevamenti extra gestione ,20,account_type_asset,other,TRUE
-2105,2105,titolare c/ritenute subite ,20,account_type_asset,other,TRUE
-22,22,FONDI PER RISCHI E ONERI ,2,account_type_view,view,TRUE
-2201,2201,fondo per imposte ,22,account_type_asset,other,TRUE
-2204,2204,fondo responsabilità civile ,22,account_type_asset,other,TRUE
-2205,2205,fondo spese future ,22,account_type_asset,other,TRUE
-2211,2211,fondo manutenzioni programmate ,22,account_type_asset,other,TRUE
-23,23,TRATTAMENTO FINE RAPPORTO DI LAVORO ,2,account_type_view,view,TRUE
-2301,2301,debiti per TFRL ,23,account_type_asset,other,TRUE
-24,24,DEBITI FINANZIARI ,2,account_type_view,view,TRUE
-2410,2410,mutui passivi ,24,account_type_asset,other,TRUE
-2411,2411,banche c/sovvenzioni ,24,account_type_asset,other,TRUE
-2420,2420,banche c/c passivi ,24,account_type_asset,other,TRUE
-2421,2421,banche c/RIBA all'incasso ,24,account_type_asset,other,TRUE
-2422,2422,banche c/cambiali all'incasso ,24,account_type_asset,other,TRUE
-2423,2423,banche c/anticipi su fatture ,24,account_type_asset,other,TRUE
-2440,2440,debiti v/altri finanziatori ,24,account_type_asset,other,TRUE
-25,25,DEBITI COMMERCIALI ,2,account_type_view,view,TRUE
-2501,2501,debiti v/fornitori ,25,account_type_payable,payable,TRUE
-2503,2503,cambiali passive ,25,account_type_asset,other,TRUE
-2520,2520,fatture da ricevere ,25,account_type_asset,other,TRUE
-2521,2521,debiti da liquidare ,25,account_type_asset,other,TRUE
-2530,2530,clienti c/acconti ,25,account_type_payable,payable,TRUE
-26,26,DEBITI DIVERSI ,2,account_type_view,view,TRUE
-2601,2601,IVA n/debito ,26,account_type_tax,other,TRUE
-2602,2602,debiti per ritenute da versare ,26,account_type_payable,payable,TRUE
-2605,2605,erario c/IVA ,26,account_type_payable,payable,TRUE
-2606,2606,debiti per imposte ,26,account_type_tax,other,TRUE
-2619,2619,debiti per cauzioni ,26,account_type_asset,other,TRUE
-2620,2620,personale c/retribuzioni ,26,account_type_asset,other,TRUE
-2621,2621,personale c/liquidazioni ,26,account_type_asset,other,TRUE
-2622,2622,clienti c/cessione ,26,account_type_asset,other,TRUE
-2630,2630,debiti v/istituti previdenziali ,26,account_type_asset,other,TRUE
-2640,2640,creditori diversi ,26,account_type_payable,payable,TRUE
-27,27,RATEI E RISCONTI PASSIVI ,2,account_type_view,view,TRUE
-2701,2701,ratei passivi ,27,account_type_asset,other,TRUE
-2702,2702,risconti passivi ,27,account_type_asset,other,TRUE
-28,28,CONTI TRANSITORI E DIVERSI ,2,account_type_view,view,TRUE
-2801,2801,bilancio di apertura ,28,account_type_asset,other,TRUE
-2802,2802,bilancio di chiusura ,28,account_type_asset,other,TRUE
-2810,2810,IVA c/liquidazioni ,28,account_type_asset,other,TRUE
-2811,2811,istituti previdenziali ,28,account_type_asset,other,TRUE
-2820,2820,banca ... c/c ,28,account_type_asset,other,TRUE
-2821,2821,banca ... c/c ,28,account_type_asset,other,TRUE
-2822,2822,banca ... c/c ,28,account_type_asset,other,TRUE
-29,29,CONTI DEI SISTEMI SUPPLEMENTARI ,2,account_type_view,view,TRUE
-2901,2901,beni di terzi ,29,account_type_asset,other,TRUE
-2902,2902,depositanti beni ,29,account_type_asset,other,TRUE
-2911,2911,merci da ricevere ,29,account_type_asset,other,TRUE
-2912,2912,fornitori c/impegni ,29,account_type_asset,other,TRUE
-2913,2913,impegni per beni in leasing ,29,account_type_asset,other,TRUE
-2914,2914,creditori c/leasing ,29,account_type_asset,other,TRUE
-2916,2916,clienti c/impegni ,29,account_type_asset,other,TRUE
-2917,2917,merci da consegnare ,29,account_type_asset,other,TRUE
-2921,2921,rischi per effetti scontati ,29,account_type_asset,other,TRUE
-2922,2922,banche c/effetti scontati ,29,account_type_asset,other,TRUE
-2926,2926,rischi per fideiussioni ,29,account_type_asset,other,TRUE
-2927,2927,creditori per fideiussioni ,29,account_type_asset,other,TRUE
-2931,2931,rischi per avalli ,29,account_type_asset,other,TRUE
-2932,2932,creditori per avalli ,29,account_type_asset,other,TRUE
-3,3,VALORE DELLA PRODUZIONE ,0,account_type_view,view,TRUE
-31,31,VENDITE E PRESTAZIONI ,3,account_type_view,view,TRUE
-3101,3101,merci c/vendite ,31,account_type_income,other,TRUE
-3103,3103,rimborsi spese di vendita ,31,account_type_income,other,TRUE
-3110,3110,resi su vendite ,31,account_type_income,other,TRUE
-3111,3111,ribassi e abbuoni passivi ,31,account_type_income,other,TRUE
-3112,3112,premi su vendite ,31,account_type_income,other,TRUE
-32,32,RICAVI E PROVENTI DIVERSI ,3,account_type_view,view,TRUE
-3201,3201,fitti attivi ,32,account_type_income,other,TRUE
-3202,3202,proventi vari ,32,account_type_income,other,TRUE
-3210,3210,arrotondamenti attivi ,32,account_type_income,other,TRUE
-3220,3220,plusvalenze ordinarie diverse ,32,account_type_income,other,TRUE
-3230,3230,sopravvenienze attive ordinarie diverse ,32,account_type_income,other,TRUE
-3240,3240,insussistenze attive ordinarie diverse ,32,account_type_income,other,TRUE
-4,4,COSTI DELLA PRODUZIONE ,0,account_type_view,view,TRUE
-41,41,COSTO DEL VENDUTO ,4,account_type_view,view,TRUE
-4101,4101,merci c/acquisti ,41,account_type_expense,other,TRUE
-4102,4102,materie di consumo c/acquisti ,41,account_type_expense,other,TRUE
-4105,4105,merci c/apporti ,41,account_type_expense,other,TRUE
-4110,4110,resi su acquisti ,41,account_type_expense,other,TRUE
-4111,4111,ribassi e abbuoni attivi ,41,account_type_expense,other,TRUE
-4112,4112,premi su acquisti ,41,account_type_expense,other,TRUE
-4121,4121,merci c/esistenze iniziali ,41,account_type_expense,other,TRUE
-4122,4122,materie di consumo c/esistenze iniziali ,41,account_type_expense,other,TRUE
-4131,4131,merci c/rimanenze finali ,41,account_type_expense,other,TRUE
-4132,4132,materie di consumo c/rimanenze finali ,41,account_type_expense,other,TRUE
-42,42,COSTI PER SERVIZI ,4,account_type_view,view,TRUE
-4201,4201,costi di trasporto ,42,account_type_expense,other,TRUE
-4202,4202,costi per energia ,42,account_type_expense,other,TRUE
-4203,4203,costi di pubblicità ,42,account_type_expense,other,TRUE
-4204,4204,costi di consulenze ,42,account_type_expense,other,TRUE
-4205,4205,costi postali ,42,account_type_expense,other,TRUE
-4206,4206,costi telefonici ,42,account_type_expense,other,TRUE
-4207,4207,costi di assicurazione ,42,account_type_expense,other,TRUE
-4208,4208,costi di vigilanza ,42,account_type_expense,other,TRUE
-4209,4209,costi per i locali ,42,account_type_expense,other,TRUE
-4210,4210,costi di esercizio automezzi ,42,account_type_expense,other,TRUE
-4211,4211,costi di manutenzione e riparazione ,42,account_type_expense,other,TRUE
-4212,4212,provvigioni passive ,42,account_type_expense,other,TRUE
-4213,4213,spese di incasso ,42,account_type_expense,other,TRUE
-43,43,COSTI PER GODIMENTO BENI DI TERZI ,4,account_type_view,view,TRUE
-4301,4301,fitti passivi ,43,account_type_expense,other,TRUE
-4302,4302,canoni di leasing ,43,account_type_expense,other,TRUE
-44,44,COSTI PER IL PERSONALE ,4,account_type_view,view,TRUE
-4401,4401,salari e stipendi ,44,account_type_expense,other,TRUE
-4402,4402,oneri sociali ,44,account_type_expense,other,TRUE
-4403,4403,TFRL ,44,account_type_expense,other,TRUE
-4404,4404,altri costi per il personale ,44,account_type_expense,other,TRUE
-45,45,AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ,4,account_type_view,view,TRUE
-4501,4501,ammortamento costi di impianto ,45,account_type_p_l,other,TRUE
-4506,4506,ammortamento software ,45,account_type_p_l,other,TRUE
-4508,4508,ammortamento avviamento ,45,account_type_p_l,other,TRUE
-46,46,AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ,4,account_type_view,view,TRUE
-4601,4601,ammortamento fabbricati ,46,account_type_p_l,other,TRUE
-4602,4602,ammortamento impianti e macchinari ,46,account_type_p_l,other,TRUE
-4604,4604,ammortamento attrezzature commerciali ,46,account_type_p_l,other,TRUE
-4605,4605,ammortamento macchine d'ufficio ,46,account_type_p_l,other,TRUE
-4606,4606,ammortamento arredamento ,46,account_type_p_l,other,TRUE
-4607,4607,ammortamento automezzi ,46,account_type_p_l,other,TRUE
-4608,4608,ammortamento imballaggi durevoli ,46,account_type_p_l,other,TRUE
-47,47,SVALUTAZIONI ,4,account_type_view,view,TRUE
-4701,4701,svalutazioni immobilizzazioni immateriali ,47,account_type_p_l,other,TRUE
-4702,4702,svalutazioni immobilizzazioni materiali ,47,account_type_p_l,other,TRUE
-4706,4706,svalutazione crediti ,47,account_type_p_l,other,TRUE
-48,48,ACCANTONAMENTI ,4,account_type_view,view,TRUE
-481,481,ACCANTONAMENTI PER RISCHI ,48,account_type_view,view,TRUE
-4814,4814,accantonamento per responsabilità civile ,481,account_type_p_l,other,TRUE
-482,482,ALTRI ACCANTONAMENTI ,48,account_type_view,view,TRUE
-4821,4821,accantonamento per spese future ,482,account_type_p_l,other,TRUE
-4823,4823,accantonamento per manutenzioni programmate ,482,account_type_p_l,other,TRUE
-49,49,ONERI DIVERSI ,4,account_type_view,view,TRUE
-4901,4901,oneri fiscali diversi ,49,account_type_p_l,other,TRUE
-4903,4903,oneri vari ,49,account_type_p_l,other,TRUE
-4905,4905,perdite su crediti ,49,account_type_p_l,other,TRUE
-4910,4910,arrotondamenti passivi ,49,account_type_p_l,other,TRUE
-4920,4920,minusvalenze ordinarie diverse ,49,account_type_p_l,other,TRUE
-4930,4930,sopravvenienze passive ordinarie diverse ,49,account_type_p_l,other,TRUE
-4940,4940,insussistenze passive ordinarie diverse ,49,account_type_p_l,other,TRUE
-5,5,PROVENTI E ONERI FINANZIARI ,0,account_type_view,view,TRUE
-51,51,PROVENTI FINANZIARI ,5,account_type_view,view,TRUE
-5110,5110,interessi attivi v/clienti ,51,account_type_p_l,other,TRUE
-5115,5115,interessi attivi bancari ,51,account_type_p_l,other,TRUE
-5116,5116,interessi attivi postali ,51,account_type_p_l,other,TRUE
-5140,5140,proventi finanziari diversi ,51,account_type_p_l,other,TRUE
-52,52,ONERI FINANZIARI ,5,account_type_view,view,TRUE
-5201,5201,interessi passivi v/fornitori ,52,account_type_p_l,other,TRUE
-5202,5202,interessi passivi bancari ,52,account_type_p_l,other,TRUE
-5203,5203,sconti passivi bancari ,52,account_type_p_l,other,TRUE
-5210,5210,interessi passivi su mutui ,52,account_type_p_l,other,TRUE
-5240,5240,oneri finanziari diversi ,52,account_type_p_l,other,TRUE
-7,7,PROVENTI E ONERI STRAORDINARI ,0,account_type_view,view,TRUE
-71,71,PROVENTI STRAORDINARI ,7,account_type_view,view,TRUE
-7101,7101,plusvalenze straordinarie ,71,account_type_p_l,other,TRUE
-7102,7102,sopravvenienze attive straordinarie ,71,account_type_p_l,other,TRUE
-7103,7103,insussistenze attive straordinarie ,71,account_type_p_l,other,TRUE
-72,72,ONERI STRAORDINARI ,7,account_type_view,view,TRUE
-7201,7201,minusvalenze straordinarie ,72,account_type_p_l,other,TRUE
-7202,7202,sopravvenienze passive straordinarie ,72,account_type_p_l,other,TRUE
-7203,7203,insussistenze passive straordinarie ,72,account_type_p_l,other,TRUE
-7204,7204,imposte esercizi precedenti ,72,account_type_p_l,other,TRUE
-8,8,IMPOSTE DELL'ESERCIZIO ,0,account_type_view,view,TRUE
-8101,8101,imposte dell'esercizio ,8,account_type_p_l,other,TRUE
-9,9,CONTI DI RISULTATO ,0,account_type_view,view,TRUE
-9101,9101,conto di risultato economico ,9,account_type_p_l,other,TRUE
-9102,9102,stato patrimoniale,9,account_type_p_l,other,TRUE
+0,0,Azienda,,account.data_account_type_view,view,FALSE
+1,1,ATTIVO ,0,account.data_account_type_view,view,TRUE
+11,11,IMMOBILIZZAZIONI IMMATERIALI ,1,account.data_account_type_view,view,TRUE
+1101,1101,costi di impianto ,11,account.data_account_type_asset,other,TRUE
+1106,1106,software ,11,account.data_account_type_asset,other,TRUE
+1108,1108,avviamento ,11,account.data_account_type_asset,other,TRUE
+1111,1111,fondo ammortamento costi di impianto ,11,account.data_account_type_asset,other,TRUE
+1116,1116,fondo ammortamento software ,11,account.data_account_type_asset,other,TRUE
+1118,1118,fondo ammortamento avviamento ,11,account.data_account_type_asset,other,TRUE
+12,12,IMMOBILIZZAZIONI MATERIALI ,1,account.data_account_type_view,view,TRUE
+1201,1201,fabbricati ,12,account.data_account_type_asset,other,TRUE
+1202,1202,impianti e macchinari ,12,account.data_account_type_asset,other,TRUE
+1204,1204,attrezzature commerciali ,12,account.data_account_type_asset,other,TRUE
+1205,1205,macchine d'ufficio ,12,account.data_account_type_asset,other,TRUE
+1206,1206,arredamento ,12,account.data_account_type_asset,other,TRUE
+1207,1207,automezzi ,12,account.data_account_type_asset,other,TRUE
+1208,1208,imballaggi durevoli ,12,account.data_account_type_asset,other,TRUE
+1211,1211,fondo ammortamento fabbricati ,12,account.data_account_type_asset,other,TRUE
+1212,1212,fondo ammortamento impianti e macchinari ,12,account.data_account_type_asset,other,TRUE
+1214,1214,fondo ammortamento attrezzature commerciali ,12,account.data_account_type_asset,other,TRUE
+1215,1215,fondo ammortamento macchine d'ufficio ,12,account.data_account_type_asset,other,TRUE
+1216,1216,fondo ammortamento arredamento ,12,account.data_account_type_asset,other,TRUE
+1217,1217,fondo ammortamento automezzi ,12,account.data_account_type_asset,other,TRUE
+1218,1218,fondo ammortamento imballaggi durevoli ,12,account.data_account_type_asset,other,TRUE
+1220,1220,fornitori immobilizzazioni c/acconti ,12,account.data_account_type_asset,other,TRUE
+13,13,IMMOBILIZZAZIONI FINANZIARIE ,1,account.data_account_type_view,view,TRUE
+1301,1301,mutui attivi ,13,account.data_account_type_asset,other,TRUE
+14,14,RIMANENZE ,1,account.data_account_type_view,view,TRUE
+1401,1401,materie di consumo ,14,account.data_account_type_asset,other,TRUE
+1404,1404,merci ,14,account.data_account_type_asset,other,TRUE
+1410,1410,fornitori c/acconti ,14,account.data_account_type_asset,other,TRUE
+15,15,CREDITI COMMERCIALI ,1,account.data_account_type_view,view,TRUE
+1501,1501,crediti v/clienti ,15,account.data_account_type_receivable,receivable,TRUE
+1502,1502,crediti commerciali diversi ,15,account.data_account_type_asset,other,TRUE
+1503,1503,clienti c/spese anticipate ,15,account.data_account_type_receivable,receivable,TRUE
+1505,1505,cambiali attive ,15,account.data_account_type_asset,other,TRUE
+1506,1506,cambiali allo sconto ,15,account.data_account_type_asset,other,TRUE
+1507,1507,cambiali all'incasso ,15,account.data_account_type_asset,other,TRUE
+1509,1509,fatture da emettere ,15,account.data_account_type_asset,other,TRUE
+1510,1510,crediti insoluti ,15,account.data_account_type_asset,other,TRUE
+1511,1511,cambiali insolute ,15,account.data_account_type_asset,other,TRUE
+1531,1531,crediti da liquidare ,15,account.data_account_type_asset,other,TRUE
+1540,1540,fondo svalutazione crediti ,15,account.data_account_type_asset,other,TRUE
+1541,1541,fondo rischi su crediti ,15,account.data_account_type_asset,other,TRUE
+16,16,CREDITI DIVERSI ,1,account.data_account_type_view,view,TRUE
+1601,1601,IVA n/credito ,16,account.data_account_type_asset,other,TRUE
+1602,1602,IVA c/acconto ,16,account.data_account_type_asset,other,TRUE
+1605,1605,crediti per IVA ,16,account.data_account_type_asset,other,TRUE
+1607,1607,imposte c/acconto ,16,account.data_account_type_asset,other,TRUE
+1608,1608,crediti per imposte ,16,account.data_account_type_asset,other,TRUE
+1609,1609,crediti per ritenute subite ,16,account.data_account_type_asset,other,TRUE
+1610,1610,crediti per cauzioni ,16,account.data_account_type_asset,other,TRUE
+1620,1620,personale c/acconti ,16,account.data_account_type_asset,other,TRUE
+1630,1630,crediti v/istituti previdenziali ,16,account.data_account_type_asset,other,TRUE
+1640,1640,debitori diversi ,16,account.data_account_type_receivable,receivable,TRUE
+18,18,DISPONIBILITÀ LIQUIDE ,1,account.data_account_type_view,view,TRUE
+1801,1801,banche c/c ,18,account.data_account_type_bank,liquidity,TRUE
+1810,1810,c/c postali ,18,account.data_account_type_bank,liquidity,TRUE
+1820,1820,denaro in cassa ,18,account.data_account_type_cash,liquidity,TRUE
+1821,1821,assegni ,18,account.data_account_type_cash,liquidity,TRUE
+1822,1822,valori bollati ,18,account.data_account_type_cash,liquidity,TRUE
+19,19,RATEI E RISCONTI ATTIVI ,1,account.data_account_type_view,view,TRUE
+1901,1901,ratei attivi ,19,account.data_account_type_asset,other,TRUE
+1902,1902,risconti attivi ,19,account.data_account_type_asset,other,TRUE
+2,2,PASSIVO ,0,account.data_account_type_view,view,TRUE
+20,20,PATRIMONIO NETTO ,2,account.data_account_type_view,view,TRUE
+2101,2101,patrimonio netto ,20,account.data_account_type_liability,other,TRUE
+2102,2102,utile d'esercizio ,20,account.data_account_type_liability,other,TRUE
+2103,2103,perdita d'esercizio ,20,account.data_account_type_liability,other,TRUE
+2104,2104,prelevamenti extra gestione ,20,account.data_account_type_liability,other,TRUE
+2105,2105,titolare c/ritenute subite ,20,account.data_account_type_liability,other,TRUE
+22,22,FONDI PER RISCHI E ONERI ,2,account.data_account_type_view,view,TRUE
+2201,2201,fondo per imposte ,22,account.data_account_type_liability,other,TRUE
+2204,2204,fondo responsabilità civile ,22,account.data_account_type_liability,other,TRUE
+2205,2205,fondo spese future ,22,account.data_account_type_liability,other,TRUE
+2211,2211,fondo manutenzioni programmate ,22,account.data_account_type_liability,other,TRUE
+23,23,TRATTAMENTO FINE RAPPORTO DI LAVORO ,2,account.data_account_type_view,view,TRUE
+2301,2301,debiti per TFRL ,23,account.data_account_type_liability,other,TRUE
+24,24,DEBITI FINANZIARI ,2,account.data_account_type_view,view,TRUE
+2410,2410,mutui passivi ,24,account.data_account_type_liability,other,TRUE
+2411,2411,banche c/sovvenzioni ,24,account.data_account_type_liability,other,TRUE
+2420,2420,banche c/c passivi ,24,account.data_account_type_liability,other,TRUE
+2421,2421,banche c/RIBA all'incasso ,24,account.data_account_type_liability,other,TRUE
+2422,2422,banche c/cambiali all'incasso ,24,account.data_account_type_liability,other,TRUE
+2423,2423,banche c/anticipi su fatture ,24,account.data_account_type_liability,other,TRUE
+2440,2440,debiti v/altri finanziatori ,24,account.data_account_type_liability,other,TRUE
+25,25,DEBITI COMMERCIALI ,2,account.data_account_type_view,view,TRUE
+2501,2501,debiti v/fornitori ,25,account.data_account_type_payable,payable,TRUE
+2503,2503,cambiali passive ,25,account.data_account_type_liability,other,TRUE
+2520,2520,fatture da ricevere ,25,account.data_account_type_liability,other,TRUE
+2521,2521,debiti da liquidare ,25,account.data_account_type_liability,other,TRUE
+2530,2530,clienti c/acconti ,25,account.data_account_type_payable,payable,TRUE
+26,26,DEBITI DIVERSI ,2,account.data_account_type_view,view,TRUE
+2601,2601,IVA n/debito ,26,account.data_account_type_liability,other,TRUE
+2602,2602,debiti per ritenute da versare ,26,account.data_account_type_payable,payable,TRUE
+2605,2605,erario c/IVA ,26,account.data_account_type_payable,payable,TRUE
+2606,2606,debiti per imposte ,26,account.data_account_type_liability,other,TRUE
+2619,2619,debiti per cauzioni ,26,account.data_account_type_liability,other,TRUE
+2620,2620,personale c/retribuzioni ,26,account.data_account_type_liability,other,TRUE
+2621,2621,personale c/liquidazioni ,26,account.data_account_type_liability,other,TRUE
+2622,2622,clienti c/cessione ,26,account.data_account_type_liability,other,TRUE
+2630,2630,debiti v/istituti previdenziali ,26,account.data_account_type_liability,other,TRUE
+2640,2640,creditori diversi ,26,account.data_account_type_payable,payable,TRUE
+27,27,RATEI E RISCONTI PASSIVI ,2,account.data_account_type_view,view,TRUE
+2701,2701,ratei passivi ,27,account.data_account_type_liability,other,TRUE
+2702,2702,risconti passivi ,27,account.data_account_type_liability,other,TRUE
+28,28,CONTI TRANSITORI E DIVERSI ,2,account.data_account_type_view,view,TRUE
+2801,2801,bilancio di apertura ,28,account.data_account_type_liability,other,TRUE
+2802,2802,bilancio di chiusura ,28,account.data_account_type_liability,other,TRUE
+2810,2810,IVA c/liquidazioni ,28,account.data_account_type_liability,other,TRUE
+2811,2811,istituti previdenziali ,28,account.data_account_type_liability,other,TRUE
+2820,2820,banca ... c/c ,28,account.data_account_type_liability,other,TRUE
+2821,2821,banca ... c/c ,28,account.data_account_type_liability,other,TRUE
+2822,2822,banca ... c/c ,28,account.data_account_type_liability,other,TRUE
+29,29,CONTI DEI SISTEMI SUPPLEMENTARI ,2,account.data_account_type_view,view,TRUE
+2901,2901,beni di terzi ,29,account.data_account_type_liability,other,TRUE
+2902,2902,depositanti beni ,29,account.data_account_type_liability,other,TRUE
+2911,2911,merci da ricevere ,29,account.data_account_type_liability,other,TRUE
+2912,2912,fornitori c/impegni ,29,account.data_account_type_liability,other,TRUE
+2913,2913,impegni per beni in leasing ,29,account.data_account_type_liability,other,TRUE
+2914,2914,creditori c/leasing ,29,account.data_account_type_liability,other,TRUE
+2916,2916,clienti c/impegni ,29,account.data_account_type_liability,other,TRUE
+2917,2917,merci da consegnare ,29,account.data_account_type_liability,other,TRUE
+2921,2921,rischi per effetti scontati ,29,account.data_account_type_liability,other,TRUE
+2922,2922,banche c/effetti scontati ,29,account.data_account_type_liability,other,TRUE
+2926,2926,rischi per fideiussioni ,29,account.data_account_type_liability,other,TRUE
+2927,2927,creditori per fideiussioni ,29,account.data_account_type_liability,other,TRUE
+2931,2931,rischi per avalli ,29,account.data_account_type_liability,other,TRUE
+2932,2932,creditori per avalli ,29,account.data_account_type_liability,other,TRUE
+3,3,VALORE DELLA PRODUZIONE ,0,account.data_account_type_view,view,TRUE
+31,31,VENDITE E PRESTAZIONI ,3,account.data_account_type_view,view,TRUE
+3101,3101,merci c/vendite ,31,account.data_account_type_income,other,TRUE
+3103,3103,rimborsi spese di vendita ,31,account.data_account_type_income,other,TRUE
+3110,3110,resi su vendite ,31,account.data_account_type_income,other,TRUE
+3111,3111,ribassi e abbuoni passivi ,31,account.data_account_type_income,other,TRUE
+3112,3112,premi su vendite ,31,account.data_account_type_income,other,TRUE
+32,32,RICAVI E PROVENTI DIVERSI ,3,account.data_account_type_view,view,TRUE
+3201,3201,fitti attivi ,32,account.data_account_type_income,other,TRUE
+3202,3202,proventi vari ,32,account.data_account_type_income,other,TRUE
+3210,3210,arrotondamenti attivi ,32,account.data_account_type_income,other,TRUE
+3220,3220,plusvalenze ordinarie diverse ,32,account.data_account_type_income,other,TRUE
+3230,3230,sopravvenienze attive ordinarie diverse ,32,account.data_account_type_income,other,TRUE
+3240,3240,insussistenze attive ordinarie diverse ,32,account.data_account_type_income,other,TRUE
+4,4,COSTI DELLA PRODUZIONE ,0,account.data_account_type_view,view,TRUE
+41,41,COSTO DEL VENDUTO ,4,account.data_account_type_view,view,TRUE
+4101,4101,merci c/acquisti ,41,account.data_account_type_expense,other,TRUE
+4102,4102,materie di consumo c/acquisti ,41,account.data_account_type_expense,other,TRUE
+4105,4105,merci c/apporti ,41,account.data_account_type_expense,other,TRUE
+4110,4110,resi su acquisti ,41,account.data_account_type_expense,other,TRUE
+4111,4111,ribassi e abbuoni attivi ,41,account.data_account_type_expense,other,TRUE
+4112,4112,premi su acquisti ,41,account.data_account_type_expense,other,TRUE
+4121,4121,merci c/esistenze iniziali ,41,account.data_account_type_expense,other,TRUE
+4122,4122,materie di consumo c/esistenze iniziali ,41,account.data_account_type_expense,other,TRUE
+4131,4131,merci c/rimanenze finali ,41,account.data_account_type_expense,other,TRUE
+4132,4132,materie di consumo c/rimanenze finali ,41,account.data_account_type_expense,other,TRUE
+42,42,COSTI PER SERVIZI ,4,account.data_account_type_view,view,TRUE
+4201,4201,costi di trasporto ,42,account.data_account_type_expense,other,TRUE
+4202,4202,costi per energia ,42,account.data_account_type_expense,other,TRUE
+4203,4203,costi di pubblicità ,42,account.data_account_type_expense,other,TRUE
+4204,4204,costi di consulenze ,42,account.data_account_type_expense,other,TRUE
+4205,4205,costi postali ,42,account.data_account_type_expense,other,TRUE
+4206,4206,costi telefonici ,42,account.data_account_type_expense,other,TRUE
+4207,4207,costi di assicurazione ,42,account.data_account_type_expense,other,TRUE
+4208,4208,costi di vigilanza ,42,account.data_account_type_expense,other,TRUE
+4209,4209,costi per i locali ,42,account.data_account_type_expense,other,TRUE
+4210,4210,costi di esercizio automezzi ,42,account.data_account_type_expense,other,TRUE
+4211,4211,costi di manutenzione e riparazione ,42,account.data_account_type_expense,other,TRUE
+4212,4212,provvigioni passive ,42,account.data_account_type_expense,other,TRUE
+4213,4213,spese di incasso ,42,account.data_account_type_expense,other,TRUE
+43,43,COSTI PER GODIMENTO BENI DI TERZI ,4,account.data_account_type_view,view,TRUE
+4301,4301,fitti passivi ,43,account.data_account_type_expense,other,TRUE
+4302,4302,canoni di leasing ,43,account.data_account_type_expense,other,TRUE
+44,44,COSTI PER IL PERSONALE ,4,account.data_account_type_view,view,TRUE
+4401,4401,salari e stipendi ,44,account.data_account_type_expense,other,TRUE
+4402,4402,oneri sociali ,44,account.data_account_type_expense,other,TRUE
+4403,4403,TFRL ,44,account.data_account_type_expense,other,TRUE
+4404,4404,altri costi per il personale ,44,account.data_account_type_expense,other,TRUE
+45,45,AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ,4,account.data_account_type_view,view,TRUE
+4501,4501,ammortamento costi di impianto ,45,account.data_account_type_expense,other,TRUE
+4506,4506,ammortamento software ,45,account.data_account_type_expense,other,TRUE
+4508,4508,ammortamento avviamento ,45,account.data_account_type_expense,other,TRUE
+46,46,AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ,4,account.data_account_type_view,view,TRUE
+4601,4601,ammortamento fabbricati ,46,account.data_account_type_expense,other,TRUE
+4602,4602,ammortamento impianti e macchinari ,46,account.data_account_type_expense,other,TRUE
+4604,4604,ammortamento attrezzature commerciali ,46,account.data_account_type_expense,other,TRUE
+4605,4605,ammortamento macchine d'ufficio ,46,account.data_account_type_expense,other,TRUE
+4606,4606,ammortamento arredamento ,46,account.data_account_type_expense,other,TRUE
+4607,4607,ammortamento automezzi ,46,account.data_account_type_expense,other,TRUE
+4608,4608,ammortamento imballaggi durevoli ,46,account.data_account_type_expense,other,TRUE
+47,47,SVALUTAZIONI ,4,account.data_account_type_view,view,TRUE
+4701,4701,svalutazioni immobilizzazioni immateriali ,47,account.data_account_type_expense,other,TRUE
+4702,4702,svalutazioni immobilizzazioni materiali ,47,account.data_account_type_expense,other,TRUE
+4706,4706,svalutazione crediti ,47,account.data_account_type_expense,other,TRUE
+48,48,ACCANTONAMENTI ,4,account.data_account_type_view,view,TRUE
+481,481,ACCANTONAMENTI PER RISCHI ,48,account.data_account_type_view,view,TRUE
+4814,4814,accantonamento per responsabilità civile ,481,account.data_account_type_expense,other,TRUE
+482,482,ALTRI ACCANTONAMENTI ,48,account.data_account_type_view,view,TRUE
+4821,4821,accantonamento per spese future ,482,account.data_account_type_expense,other,TRUE
+4823,4823,accantonamento per manutenzioni programmate ,482,account.data_account_type_expense,other,TRUE
+49,49,ONERI DIVERSI ,4,account.data_account_type_view,view,TRUE
+4901,4901,oneri fiscali diversi ,49,account.data_account_type_expense,other,TRUE
+4903,4903,oneri vari ,49,account.data_account_type_expense,other,TRUE
+4905,4905,perdite su crediti ,49,account.data_account_type_expense,other,TRUE
+4910,4910,arrotondamenti passivi ,49,account.data_account_type_expense,other,TRUE
+4920,4920,minusvalenze ordinarie diverse ,49,account.data_account_type_expense,other,TRUE
+4930,4930,sopravvenienze passive ordinarie diverse ,49,account.data_account_type_expense,other,TRUE
+4940,4940,insussistenze passive ordinarie diverse ,49,account.data_account_type_expense,other,TRUE
+5,5,PROVENTI E ONERI FINANZIARI ,0,account.data_account_type_view,view,TRUE
+51,51,PROVENTI FINANZIARI ,5,account.data_account_type_view,view,TRUE
+5110,5110,interessi attivi v/clienti ,51,account.data_account_type_income,other,TRUE
+5115,5115,interessi attivi bancari ,51,account.data_account_type_income,other,TRUE
+5116,5116,interessi attivi postali ,51,account.data_account_type_income,other,TRUE
+5140,5140,proventi finanziari diversi ,51,account.data_account_type_income,other,TRUE
+52,52,ONERI FINANZIARI ,5,account.data_account_type_view,view,TRUE
+5201,5201,interessi passivi v/fornitori ,52,account.data_account_type_expense,other,TRUE
+5202,5202,interessi passivi bancari ,52,account.data_account_type_expense,other,TRUE
+5203,5203,sconti passivi bancari ,52,account.data_account_type_expense,other,TRUE
+5210,5210,interessi passivi su mutui ,52,account.data_account_type_expense,other,TRUE
+5240,5240,oneri finanziari diversi ,52,account.data_account_type_expense,other,TRUE
+7,7,PROVENTI E ONERI STRAORDINARI ,0,account.data_account_type_view,view,TRUE
+71,71,PROVENTI STRAORDINARI ,7,account.data_account_type_view,view,TRUE
+7101,7101,plusvalenze straordinarie ,71,account.data_account_type_income,other,TRUE
+7102,7102,sopravvenienze attive straordinarie ,71,account.data_account_type_income,other,TRUE
+7103,7103,insussistenze attive straordinarie ,71,account.data_account_type_income,other,TRUE
+72,72,ONERI STRAORDINARI ,7,account.data_account_type_view,view,TRUE
+7201,7201,minusvalenze straordinarie ,72,account.data_account_type_expense,other,TRUE
+7202,7202,sopravvenienze passive straordinarie ,72,account.data_account_type_expense,other,TRUE
+7203,7203,insussistenze passive straordinarie ,72,account.data_account_type_expense,other,TRUE
+7204,7204,imposte esercizi precedenti ,72,account.data_account_type_expense,other,TRUE
+8,8,IMPOSTE DELL'ESERCIZIO ,0,account.data_account_type_view,view,TRUE
+8101,8101,imposte dell'esercizio ,8,account.data_account_type_expense,other,TRUE
+9,9,CONTI DI RISULTATO ,0,account.data_account_type_view,view,TRUE
+9101,9101,conto di risultato economico ,9,account.data_account_type_expense,other,TRUE
+9102,9102,stato patrimoniale,9,account.data_account_type_expense,other,TRUE
diff --git a/addons/l10n_it/data/account.account.type.csv b/addons/l10n_it/data/account.account.type.csv
deleted file mode 100644
index 36eeebbbe89..00000000000
--- a/addons/l10n_it/data/account.account.type.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-"id","code","name","close_method","report_type"
-"account_type_receivable","receivable","Crediti","unreconciled","asset"
-"account_type_payable","payable","Debiti","unreconciled","liability"
-"account_type_view","view","Gerarchia","none",
-"account_type_income","income","Entrate","none","income"
-"account_type_expense","expense","Uscite","none","expense"
-"account_type_tax","tax","Tasse","balance",
-"account_type_cash","cash","Liquidità","balance","asset"
-"account_type_asset","asset","Beni","balance","asset"
-"account_type_bank","bank","Banca","balance","asset"
-"account_type_p_l","p_l","Conto Economico","none",
diff --git a/addons/l10n_it/static/src/img/icon.png b/addons/l10n_it/static/src/img/icon.png
new file mode 100644
index 00000000000..2aa4dd28bdc
--- /dev/null
+++ b/addons/l10n_it/static/src/img/icon.png
diff --git a/addons/l10n_lu/static/src/img/icon.png b/addons/l10n_lu/static/src/img/icon.png
new file mode 100644
index 00000000000..b656d945be1
--- /dev/null
+++ b/addons/l10n_lu/static/src/img/icon.png
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index 846abccd3f4..5151378d2f7 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -46,9 +46,9 @@ class report_custom(report_int):
         partner = user.company_id.partner_id
         result['info_name'] = user.company_id.name
         result['info_vatnum'] = partner.vat
-        if partner.address:
-            result['info_address'] = partner.address[0].street
-            result['info_address2'] = (partner.address[0].zip or '') + ' ' + (partner.address[0].city or '')
+        if partner:
+            result['info_address'] = partner.street
+            result['info_address2'] = (partner.zip or '') + ' ' + (partner.city or '')
         try:
             tmp_file = tempfile.mkstemp(".pdf")[1]
             try:
diff --git a/addons/l10n_ma/security/compta_security.xml b/addons/l10n_ma/security/compta_security.xml
index bcde4d188b2..8d511ae7154 100644
--- a/addons/l10n_ma/security/compta_security.xml
+++ b/addons/l10n_ma/security/compta_security.xml
@@ -2,6 +2,7 @@
 
     <record id="group_expert_comptable" model="res.groups">
         <field name="name">Finance / Expert Comptable </field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 </data>
 </openerp>
diff --git a/addons/l10n_ma/static/src/img/icon.png b/addons/l10n_ma/static/src/img/icon.png
new file mode 100644
index 00000000000..6bd7c5362b6
--- /dev/null
+++ b/addons/l10n_ma/static/src/img/icon.png
diff --git a/addons/l10n_mx/static/src/img/icon.png b/addons/l10n_mx/static/src/img/icon.png
new file mode 100644
index 00000000000..531a78ed9d8
--- /dev/null
+++ b/addons/l10n_mx/static/src/img/icon.png
diff --git a/addons/l10n_nl/static/src/img/icon.png b/addons/l10n_nl/static/src/img/icon.png
new file mode 100644
index 00000000000..48485f76ec0
--- /dev/null
+++ b/addons/l10n_nl/static/src/img/icon.png
diff --git a/addons/l10n_pe/static/src/img/icon.png b/addons/l10n_pe/static/src/img/icon.png
new file mode 100644
index 00000000000..e71af2a4566
--- /dev/null
+++ b/addons/l10n_pe/static/src/img/icon.png
diff --git a/addons/l10n_pl/static/src/img/icon.png b/addons/l10n_pl/static/src/img/icon.png
new file mode 100644
index 00000000000..7be06bbe532
--- /dev/null
+++ b/addons/l10n_pl/static/src/img/icon.png
diff --git a/addons/l10n_ro/static/src/img/icon.png b/addons/l10n_ro/static/src/img/icon.png
new file mode 100644
index 00000000000..7ba9c1019cd
--- /dev/null
+++ b/addons/l10n_ro/static/src/img/icon.png
diff --git a/addons/l10n_th/static/src/img/icon.png b/addons/l10n_th/static/src/img/icon.png
new file mode 100644
index 00000000000..2b00b9b9109
--- /dev/null
+++ b/addons/l10n_th/static/src/img/icon.png
diff --git a/addons/l10n_uk/demo/demo.xml b/addons/l10n_uk/demo/demo.xml
index b23cd76ec6d..1184828df50 100644
--- a/addons/l10n_uk/demo/demo.xml
+++ b/addons/l10n_uk/demo/demo.xml
@@ -7,7 +7,7 @@
             <field name="name">SmartMode LTD</field>
         </record>
 
-        <record id="res_partner_address_1" model="res.partner.address">
+        <record id="res_partner_address_1" model="res.partner">
             <field name="fax">08455274653</field>
             <field name="name">Vadim Chobanu</field>
             <field name="zip">HA4 7JW</field>
diff --git a/addons/l10n_uk/static/src/img/icon.png b/addons/l10n_uk/static/src/img/icon.png
new file mode 100644
index 00000000000..7842d579341
--- /dev/null
+++ b/addons/l10n_uk/static/src/img/icon.png
diff --git a/addons/l10n_us/static/src/img/icon.png b/addons/l10n_us/static/src/img/icon.png
new file mode 100644
index 00000000000..8b7fd408ac3
--- /dev/null
+++ b/addons/l10n_us/static/src/img/icon.png
diff --git a/addons/l10n_uy/static/src/img/icon.png b/addons/l10n_uy/static/src/img/icon.png
new file mode 100644
index 00000000000..090d65271b7
--- /dev/null
+++ b/addons/l10n_uy/static/src/img/icon.png
diff --git a/addons/l10n_ve/static/src/img/icon.png b/addons/l10n_ve/static/src/img/icon.png
new file mode 100644
index 00000000000..e102f5381de
--- /dev/null
+++ b/addons/l10n_ve/static/src/img/icon.png
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index f695d994acd..7d9cd7255d3 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -7,9 +7,9 @@
           <menuitem name="Reporting" parent="base.menu_tools"
               id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager"/>
 
-          <menuitem name="Lunch Orders"
-              parent="base.menu_lunch_reporting"
-              id="menu_lunch_reporting_order" sequence="1" />
+          <menuitem name="Lunch"
+              parent="base.menu_reporting"
+              id="menu_lunch_reporting_order" sequence="55" />
 
           <menuitem name="Configuration" parent="base.menu_tools"
               id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
@@ -266,7 +266,7 @@
                           <field name="price" />
                      </group>
                      <notebook colspan="4">
-                         <page string="General Information"> 
+                         <page string="General Information">
                               <field name="active"/>
                               <separator string="Description" colspan="4" />
                               <field name="description" nolabel="1" colspan="4" />
@@ -287,6 +287,7 @@
                     <field name="name"/>
                     <field name="category_id"/>
                     <field name="price"/>
+                    <field name="description"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 7d665c96435..46293a97561 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 72164b89865..4787883ef9c 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -23,7 +23,6 @@ import mail_message
 import mail_thread
 import res_partner
 import wizard
-import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 1cad3fafa5d..8085d301364 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -62,7 +62,6 @@ The main features are:
         "res_partner_view.xml",
         'security/ir.model.access.csv',
         'mail_data.xml',
-        'res_config_view.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b41f1213791..aef3aa24767 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -33,6 +33,7 @@ import tools
 from osv import osv
 from osv import fields
 from tools.translate import _
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger('mail')
 
@@ -149,7 +150,9 @@ class mail_message(osv.osv):
             context = {}
         tz = context.get('tz')
         result = {}
-        for message in self.browse(cr, uid, ids, context=context):
+
+        # Read message as UID 1 to allow viewing author even if from different company
+        for message in self.browse(cr, SUPERUSER_ID, ids):
             msg_txt = ''
             if message.email_from:
                 msg_txt += _('%s wrote on %s: \n Subject: %s \n\t') % (message.email_from or '/', format_date_tz(message.date, tz), message.subject)
@@ -263,7 +266,7 @@ class mail_message(osv.osv):
             attachment_data = {
                     'name': fname,
                     'datas_fname': fname,
-                    'datas': fcontent,
+                    'datas': fcontent and fcontent.encode('base64'),
                     'res_model': self._name,
                     'res_id': email_msg_id,
             }
@@ -443,6 +446,7 @@ class mail_message(osv.osv):
                         msg['body_html'] = content
                         msg['subtype'] = 'html' # html version prevails
                         body = tools.ustr(tools.html2plaintext(content))
+                        body = body.replace('&#13;', '')
                     elif part.get_content_subtype() == 'plain':
                         body = content
                 elif part.get_content_maintype() in ('application', 'image'):
@@ -460,6 +464,23 @@ class mail_message(osv.osv):
         msg['sub_type'] = msg['subtype'] or 'plain'
         return msg
 
+    def _postprocess_sent_message(self, cr, uid, message, context=None):
+        """Perform any post-processing necessary after sending ``message``
+        successfully, including deleting it completely along with its
+        attachment if the ``auto_delete`` flag of the message was set.
+        Overridden by subclasses for extra post-processing behaviors. 
+
+        :param browse_record message: the message that was just sent
+        :return: True
+        """
+        if message.auto_delete:
+            self.pool.get('ir.attachment').unlink(cr, uid,
+                                                  [x.id for x in message.attachment_ids \
+                                                        if x.res_model == self._name and \
+                                                           x.res_id == message.id],
+                                                  context=context)
+            message.unlink()
+        return True
 
     def send(self, cr, uid, ids, auto_commit=False, context=None):
         """Sends the selected emails immediately, ignoring their current
@@ -517,14 +538,9 @@ class mail_message(osv.osv):
                     message.write({'state':'sent', 'message_id': res})
                 else:
                     message.write({'state':'exception'})
-
-                # if auto_delete=True then delete that sent messages as well as attachments
                 message.refresh()
-                if message.state == 'sent' and message.auto_delete:
-                    self.pool.get('ir.attachment').unlink(cr, uid,
-                                                          [x.id for x in message.attachment_ids],
-                                                          context=context)
-                    message.unlink()
+                if message.state == 'sent':
+                    self._postprocess_sent_message(cr, uid, message, context=context)
             except Exception:
                 _logger.exception('failed sending mail.message %s', message.id)
                 message.write({'state':'exception'})
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 70b536296bf..56afb34e8c0 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -455,18 +455,14 @@ class mail_thread(osv.osv):
                       { 'partner_address_id': id or False,
                         'partner_id': pid or False }
         """
-        address_pool = self.pool.get('res.partner.address')
-        res = {
-            'partner_address_id': False,
-            'partner_id': False
-        }
+        partner_pool = self.pool.get('res.partner')
+        res = {'partner_id': False}
         if email:
             email = to_email(email)[0]
-            address_ids = address_pool.search(cr, uid, [('email', '=', email)])
-            if address_ids:
-                address = address_pool.browse(cr, uid, address_ids[0])
-                res['partner_address_id'] = address_ids[0]
-                res['partner_id'] = address.partner_id.id
+            contact_ids = partner_pool.search(cr, uid, [('email', '=', email)])
+            if contact_ids:
+                contact = partner_pool.browse(cr, uid, contact_ids[0])
+                res['partner_id'] = contact.id
         return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
deleted file mode 100644
index 89038a43610..00000000000
--- a/addons/mail/res_config.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class plugin_configuration(osv.osv_memory):
-    _inherit = 'sale.config.settings'
-    
-    _columns = {
-        'module_plugin_thunderbird': fields.boolean('Thunderbird plugin',
-            help="""The plugin allows you archive email and its attachments to the selected
-                OpenERP objects. You can select a partner, a task, a project, an analytical
-                account, or any other object and attach the selected mail as a .eml file in
-                the attachment of a selected record. You can create documents for CRM Lead,
-                HR Applicant and Project Issue from the selected emails.
-                This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('Outlook plugin',
-            help="""The Outlook plugin allows you to select an object that you would like to add
-                to your email and its attachments from MS Outlook. You can select a partner, a task,
-                a project, an analytical account, or any other object and archive a selected
-                email into an OpenERP mail message with attachments.
-                This installs the module plugin_outlook."""),
-    }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
deleted file mode 100644
index 4aee146d7f4..00000000000
--- a/addons/mail/res_config_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<openerp>
-    <data>
-
-        <record id="view_sales_config_plugin" model="ir.ui.view">
-            <field name="name">mail plugins settings</field>
-            <field name="model">sale.config.settings</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_sale_config_settings"/>
-            <field name="priority" eval="8"/>       <!-- plugin fields will appear last -->
-            <field name="arch" type="xml">
-                <group name="config_emails" position="inside">
-                    <separator string="Emails"/>
-                </group>
-                <group name="config_emails" position="after">
-                    <field name="module_plugin_thunderbird"/>
-                    <newline/>
-                    <field name="module_plugin_outlook"/>
-                    <newline/>
-                </group>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 07a3a1cde3b..226b7f10ba5 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_mail_message,mail.message,model_mail_message,,1,0,1,0

-access_mail_thread,mail.thread,model_mail_thread,,1,0,1,0

+access_mail_message,mail.message,model_mail_message,,1,1,1,0

+access_mail_thread,mail.thread,model_mail_thread,,1,1,1,0

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index e68bd70a739..af8baa314de 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -194,7 +194,7 @@ class mail_compose_message(osv.osv_memory):
         for mail in self.browse(cr, uid, ids, context=context):
             attachment = {}
             for attach in mail.attachment_ids:
-                attachment[attach.datas_fname] = attach.datas
+                attachment[attach.datas_fname] = attach.datas and attach.datas.decode('base64')
             references = None
             headers = {}
 
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index d04473da8bf..2afc0ab3a8b 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_marketing"/>
         <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 9ddd8093a3d..c7540935005 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -122,7 +122,7 @@
     </record>
 
     <menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
-    <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
+    <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="30" />
 
     <!--
     ======================
@@ -224,7 +224,7 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_marketing_campaign_segment_tree"/>
         <field name="search_view_id" ref="view_marketing_campaign_segment_search"/>
-        <field name="context">{'group_by': [], 'search_default_running': 1}</field>
+        <field name="context">{'group_by': []}</field>
     </record>
 
     <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" />
@@ -399,6 +399,7 @@
            <search string="Marketing Campaign Activities">
                <group>
                 <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
                 <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
                 <separator orientation="vertical"/>
@@ -436,10 +437,10 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_marketing_campaign_workitem_tree"/>
         <field name="search_view_id" ref="view_marketing_campaign_workitem_search"/>
-        <field name="context">{'group_by': [], 'search_default_todo': 1, 'search_default_today': 1}</field>
+        <field name="context">{'group_by': []}</field>
     </record>
 
-    <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="30"/>
+    <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="10"/>
 
     <act_window name="All Segments"
         res_model="marketing.campaign.segment"
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index ebbb6034a1a..a193476783d 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -60,7 +60,7 @@ class campaign_analysis(osv.osv):
         'segment_id': fields.many2one('marketing.campaign.segment', 'Segment',
                                                                 readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'country_id': fields.related('partner_id','address', 'country_id',
+        'country_id': fields.related('partner_id', 'country_id',
                     type='many2one', relation='res.country',string='Country'),
         'total_cost' : fields.function(_total_cost, string='Cost',
                                     type="float", digits_compute=dp.get_precision('Purchase Price')),
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 1bfdf69acf0..ea1ddc9a397 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -90,7 +90,7 @@
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
 
-    <menuitem name="Reporting" id="base.menu_report_marketing" parent="base.marketing_menu"/>
+    <menuitem name="Marketing" id="base.menu_report_marketing" parent="base.menu_reporting" sequence="45"/>
     <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.menu_report_marketing" sequence="2"/>
 
     </data>
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 49495318d60..543f9636f7c 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -427,7 +427,6 @@ class Partner(osv.osv):
 
             invoice_id = invoice_obj.create(cr, uid, {
                 'partner_id': partner.id,
-                'address_invoice_id': addr.get('invoice', False),
                 'account_id': account_id,
                 'fiscal_position': fpos_id or False
                 }, context=context)
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index a1c39165c82..bdb04525d43 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -126,7 +126,7 @@
         </record>
 
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
-        <menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
+        <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30" groups="base.group_extended"/>
 
@@ -215,7 +215,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_tree"/>
             <field name="arch" type="xml">
-                <tree string="Partners">
+                <tree string="Contacts">
                     <field name="category_id" position="after"/>
                     <field name="membership_state"/>
                 </tree>
diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml
index 27b755f156b..d182ebaf35b 100644
--- a/addons/membership/test/test_membership.yml
+++ b/addons/membership/test/test_membership.yml
@@ -54,15 +54,14 @@
   I'm creating free member "Ms. Johnson" of "Gold Membership".
 -
   !record {model: res.partner, id: res_partner_msjohnson0}:
-    address:
-      - city: paris
+        name: Ms. Johnson
+        city: paris
         country_id: base.fr
         name: Ms. Johnson
         street: 1 rue Rockfeller
         type: invoice
         zip: '75016'
-    name: Ms. Johnson
-    free_member: True
+        free_member: True
 
 - |
   I'm checking "Current membership state" of "Ms. Johnson". It is an "Free Member" or not.
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index ccc2bc5f15e..bdf6f63b755 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -82,7 +82,6 @@ Dashboard provided by this module:
         'process/stockable_product_process.xml',
         'process/service_product_process.xml',
         'process/procurement_process.xml',
-        'mrp_installer.xml',
         'report/mrp_report_view.xml',
         'report/mrp_production_order_view.xml',
         'board_manufacturing_view.xml',
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 9956aae4ffe..cb81d51d439 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -28,8 +28,8 @@
             <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
 
-        <menuitem id="menus_dash_mrp" name="Dashboard"
-            parent="next_id_77" sequence="0"/>
+        <menuitem id="menus_dash_mrp" name="Manufacturing"
+            parent="base.menu_reporting_dashboard" sequence="15"/>
         <menuitem
             action="open_board_manufacturing" icon="terp-graph"
             id="menu_board_manufacturing" parent="menus_dash_mrp"
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 8a25af01e7b..1f70f55e505 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -312,7 +312,7 @@ class mrp_bom(osv.osv):
         phantom = False
         if bom.type == 'phantom' and not bom.bom_lines:
             newbom = self._bom_find(cr, uid, bom.product_id.id, bom.product_uom.id, properties)
-            
+
             if newbom:
                 res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10)
                 result = result + res[0]
@@ -670,9 +670,9 @@ class mrp_production(osv.osv):
         return res
 
     def _get_subproduct_factor(self, cr, uid, production_id, move_id=None, context=None):
-        """ Compute the factor to compute the qty of procucts to produce for the given production_id. By default, 
-            it's always equal to the quantity encoded in the production order or the production wizard, but if the 
-            module mrp_subproduct is installed, then we must use the move_id to identify the product to produce 
+        """ Compute the factor to compute the qty of procucts to produce for the given production_id. By default,
+            it's always equal to the quantity encoded in the production order or the production wizard, but if the
+            module mrp_subproduct is installed, then we must use the move_id to identify the product to produce
             and its quantity.
         :param production_id: ID of the mrp.order
         :param move_id: ID of the stock move that needs to be produced. Will be used in mrp_subproduct.
@@ -733,7 +733,7 @@ class mrp_production(osv.osv):
                         prod_name = scheduled.product_id.name_get()[0][1]
                         raise osv.except_osv(_('Warning!'), _('You are going to consume total %s quantities of "%s".\nBut you can only consume up to total %s quantities.') % (qty, prod_name, qty_avail))
                     if qty <= 0.0:
-                        # we already have more qtys consumed than we need 
+                        # we already have more qtys consumed than we need
                         continue
 
                     raw_product[0].action_consume(qty, raw_product[0].location_id.id, context=context)
@@ -890,21 +890,21 @@ class mrp_production(osv.osv):
                         'state': 'waiting',
                         'company_id': production.company_id.id,
                 })
-          
+
     def _make_production_internal_shipment(self, cr, uid, production, context=None):
         ir_sequence = self.pool.get('ir.sequence')
         stock_picking = self.pool.get('stock.picking')
         routing_loc = None
         pick_type = 'internal'
-        address_id = False
-        
+        partner_id = False
+
         # Take routing address as a Shipment Address.
         # If usage of routing location is a internal, make outgoing shipment otherwise internal shipment
         if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
             routing_loc = production.bom_id.routing_id.location_id
             if routing_loc.usage <> 'internal':
                 pick_type = 'out'
-            address_id = routing_loc.address_id and routing_loc.address_id.id or False
+            partner_id = routing_loc.partner_id and routing_loc.partner_id.id or False
 
         # Take next Sequence number of shipment base on type
         pick_name = ir_sequence.get(cr, uid, 'stock.picking.' + pick_type)
@@ -915,7 +915,7 @@ class mrp_production(osv.osv):
             'type': pick_type,
             'move_type': 'one',
             'state': 'auto',
-            'address_id': address_id,
+            'partner_id': partner_id,
             'auto_picking': self._get_auto_picking(cr, uid, production),
             'company_id': production.company_id.id,
         })
@@ -926,7 +926,7 @@ class mrp_production(osv.osv):
         stock_move = self.pool.get('stock.move')
         source_location_id = production.product_id.product_tmpl_id.property_stock_production.id
         destination_location_id = production.location_dest_id.id
-        move_name = _('PROD: %s') + production.name 
+        move_name = _('PROD: %s') + production.name
         data = {
             'name': move_name,
             'date': production.date_planned,
@@ -983,7 +983,7 @@ class mrp_production(osv.osv):
         for production in self.browse(cr, uid, ids, context=context):
             shipment_id = self._make_production_internal_shipment(cr, uid, production, context=context)
             produce_move_id = self._make_production_produce_line(cr, uid, production, context=context)
-            
+
             # Take routing location as a Source Location.
             source_location_id = production.location_src_id.id
             if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
@@ -994,7 +994,7 @@ class mrp_production(osv.osv):
                 shipment_move_id = self._make_production_internal_shipment_line(cr, uid, line, shipment_id, consume_move_id,\
                                  destination_location_id=source_location_id, context=context)
                 self._make_production_line_procurement(cr, uid, line, shipment_move_id, context=context)
-                    
+
             wf_service.trg_validate(uid, 'stock.picking', shipment_id, 'button_confirm', cr)
             production.write({'state':'confirmed'}, context=context)
             message = _("Manufacturing order '%s' is scheduled for the %s.") % (
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
deleted file mode 100644
index b4d4551bda8..00000000000
--- a/addons/mrp/mrp_installer.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<openerp>
-  <data>
-    <record id="category_mrp_config" model="ir.actions.todo.category">
-        <field name="name">MRP Management</field>
-        <field name="sequence">6</field>
-    </record>
-
-    <record id="action_configure_workcenter" model="ir.actions.act_window">
-        <field name="name">Configure your work centers</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">mrp.workcenter</field>
-        <field name="view_mode">form,tree</field>
-        <field name="view_type">form</field>
-    </record>
-
-    <record id="todo_action_configure_workcenter" model="ir.actions.todo">
-        <field name="action_id" ref="action_configure_workcenter" />
-        <field name="category_id" ref="category_mrp_config" />
-        <field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
-    </record>
-
-    <record id="todo_action_create_bill_of_materials" model="ir.actions.todo">
-        <field name="action_id" ref="mrp_bom_form_action" />
-        <field name="category_id" ref="category_mrp_config" />
-    </record>
-
-    <record id="product_form_config_action" model="ir.actions.act_window">
-        <field name="name">Create or Import Products</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">product.product</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="product.product_product_tree_view"/>
-        <field name="help">Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased.</field>
-    </record>
-
-    <record id="config_wizard_res_product_installer" model="ir.actions.todo">
-        <field name="action_id" ref="product_form_config_action"/>
-        <field name="category_id" ref="category_mrp_config" />
-        <field name="sequence">20</field>
-    </record>
-</data>
-</openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index cd626baae21..961d42cee2b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -105,17 +105,17 @@
         <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
             parent="menu_mrp_configuration"
-            groups="mrp.group_mrp_routings,mrp.group_mrp_properties"
+            groups="mrp.group_mrp_routings,product.group_mrp_properties"
             sequence="20" />
         <menuitem
             action="mrp_property_action"
             id="menu_mrp_property_action"
-            groups="mrp.group_mrp_properties"
+            groups="product.group_mrp_properties"
             parent="menu_mrp_property"/>
         <menuitem
             action="mrp_property_group_action"
             parent="menu_mrp_property"
-            groups="mrp.group_mrp_properties"
+            groups="product.group_mrp_properties"
             id="menu_mrp_property_group_action"/>
 
         <!--
@@ -306,7 +306,7 @@
             <field name="search_view_id" ref="mrp_routing_search_view"/>
             <field name="help">Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
         </record>
-        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="mrp.group_mrp_routings" sequence="1"/>
+        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="mrp.group_mrp_routings" sequence="15"/>
 
         <!--
           Bill of Materials
@@ -377,7 +377,7 @@
                                     <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}">
                                         <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
                                     </page>
-                                    <page string="Properties" groups="mrp.group_mrp_properties">
+                                    <page string="Properties" groups="product.group_mrp_properties">
                                         <field name="position"/>
                                         <field name="active"/>
                                         <field name="sequence"/>
@@ -397,7 +397,7 @@
                         <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}">
                             <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string="Properties" groups="mrp.group_mrp_properties">
+                        <page string="Properties" groups="product.group_mrp_properties">
                             <field name="position"/>
                             <field name="active"/>
                             <field name="sequence"/>
@@ -836,7 +836,7 @@
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
-            <field name="context">{'search_default_ready':1}</field>
+            <field name="context">{}</field>
             <field name="help">Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumption of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed.</field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action"
@@ -963,7 +963,7 @@
                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
                 </xpath>
                 <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
-                    <group colspan="4"  groups="mrp.group_mrp_properties">
+                    <group colspan="4"  groups="product.group_mrp_properties">
                     <separator colspan="4" string="Properties" />
                     <field colspan="4" name="property_ids" nolabel="1"/>
                      </group>
@@ -1014,9 +1014,9 @@
         </record>
 
         <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
-        <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
-        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
-        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
+        <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" groups="mrp.group_mrp_routings" parent="mrp.menu_mrp_bom" sequence="25"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1" groups="base.group_no_one"/>
 
         <!-- Planning -->
 
@@ -1024,7 +1024,7 @@
                 parent="base.menu_mrp_root" sequence="2"
                 groups="base.group_extended"/>
         <menuitem action="mrp.mrp_production_action_planning"
-                id="menu_mrp_production_order_action"
+                id="menu_mrp_production_order_action" name="Orders Planning"
                 parent="menu_mrp_planning" sequence="1"/>
 
     </data>
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index b7e51dd7cf0..251eafc89ea 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -41,8 +41,8 @@
                 </search>
             </field>
         </record>
-        <menuitem id="next_id_77" name="Reporting"
-            parent="base.menu_mrp_root" sequence="49"/>
+        <menuitem id="next_id_77" name="Manufacturing"
+            parent="base.menu_reporting" sequence="20"/>
 
         <!-- stock.move compared to internal location src/dest -->
 
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 84fb90e3bff..eb06de642ed 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -28,12 +28,12 @@ class mrp_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_planning': fields.boolean('Track work order planning',
+        'module_stock_planning': fields.boolean('Master Production Schedule',
             help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
                 which works automatically based on minimum stock rules.
                 This installs the module stock_planning."""),
-        'module_mrp_repair': fields.boolean("Track products repair",
-            help="""Allows to manage all products repairs.
+        'module_mrp_repair': fields.boolean("Manage Product Repairs",
+            help="""Allows to manage all product repairs.
                     * Add/remove products in the reparation
                     * Impact for stocks
                     * Invoicing (products and/or services)
@@ -41,39 +41,26 @@ class mrp_config_settings(osv.osv_memory):
                     * Repair quotation report
                     * Notes for the technician and for the final customer.
                 This installs the module mrp_repair."""),
-        'module_mrp_operations': fields.boolean("Track dates in work order operations",
+        'module_mrp_operations': fields.boolean("Track Dates in Work Order Operations",
             help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
                 This installs the module mrp_operations."""),
-        'module_mrp_subproduct': fields.boolean("Produce several products from one production",
+        'module_mrp_subproduct': fields.boolean("Produce Different Products from one Production",
             help="""You can configure sub-products in the bill of material.
                 Without this module: A + B + C -> D.
                 With this module: A + B + C -> D + E.
                 This installs the module mrp_subproduct."""),
-        'module_stock_location': fields.boolean("Allow push/pull flows by product",
-            help="""Allows to implement Push and Pull inventory flows.
-                Typically this could be used to:
-                    * Manage product manufacturing chains
-                    * Manage default locations per product
-                    * Define routes within your warehouse according to business needs, such as:
-                        - Quality Control
-                        - After Sales Services
-                        - Supplier Returns.
-                This installs the module stock_location."""),
-        'module_mrp_jit': fields.boolean("Allow just in time scheduling",
+        'module_mrp_jit': fields.boolean("Just in Time Scheduling",
             help="""This allows Just In Time computation of procurement orders.
                 All procurement orders will be processed immediately, which could in some
                 cases entail a small performance impact.
                 This installs the module mrp_jit."""),
-        'module_mrp_operations': fields.boolean("Track dates in work order operations",
-            help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
-                This installs the module mrp_operations."""),
-        'group_mrp_routings': fields.boolean("Manage manufacturing operations ",
+        'group_mrp_routings': fields.boolean("Manage Routings and Work Orders",
             implied_group='mrp.group_mrp_routings',
             help="""Routings allow you to create and manage the manufacturing operations that should be followed
                 within your work centers in order to produce a product. They are attached to bills of materials
                 that will define the required raw materials."""),
-        'group_mrp_properties': fields.boolean("Allow different properties per product in your order",
-            implied_group='mrp.group_mrp_properties',
+        'group_mrp_properties': fields.boolean("Manage Properties",
+            implied_group='product.group_mrp_properties',
             help="""Allows to define specific property that can be assigned to your bill of materials."""),
     }
 
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index d520b760268..c0b36915f93 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -8,19 +8,22 @@
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing">
                     <separator string="Manufacturing Order" colspan="4"/>
-                    <field name="group_mrp_routings"/>
                     <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_stock_location"/>
-                    <newline/>
                     <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"/>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 4289010d165..cd6b8db2195 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -37,7 +37,6 @@ access_product_product_user,product.product user,product.model_product_product,m
 access_product_template_user,product.template user,product.model_product_template,mrp.group_mrp_user,1,0,0,0

 access_product_uom_user,product.uom user,product.model_product_uom,mrp.group_mrp_user,1,0,0,0

 access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_user,1,1,1,1

-access_res_partner_address,res.partner.address,base.model_res_partner_address,mrp.group_mrp_user,1,0,0,0

 access_stock_tracking,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_user,1,1,1,0

 access_res_partner,res.partner,base.model_res_partner,mrp.group_mrp_user,1,0,0,0

 access_workcenter_user,mrp.production.workcenter.line.user,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1

diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 7042423bc0b..f1f26aae1f2 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_manufacturing"/>
         <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record id="group_mrp_routings" model="res.groups">
@@ -17,11 +18,6 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_mrp_properties" model="res.groups">
-        <field name="name">Manage Properties of Product</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <!-- restrict access to menu -->
     <record model='ir.ui.menu' id="mrp_Sched_all">
         <field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index 496e039d0d4..ee78e036d44 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -22,8 +22,8 @@
             assert line.product_qty == (2.0*factor), "Qty is not correspond."
             assert line.product_uom.id == ref('product.product_uom_unit'), "UOM is not correspond"
             sidepanel = True
-        elif line.product_id.id == ref('product.product_product_woodlintelm0'):                     #LIN40 	     4*0.25 Meter 	
-            assert not woodlintelm, "Production line is already generated for LIN40."            
+        elif line.product_id.id == ref('product.product_product_woodlintelm0'):                     #LIN40 	     4*0.25 Meter
+            assert not woodlintelm, "Production line is already generated for LIN40."
             assert line.product_qty == (4*0.25*factor), "Qty is not correspond."
             assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond"
             woodlintelm = True
@@ -32,7 +32,7 @@
             assert line.product_qty == (0.25*factor), "Qty is not correspond."
             assert line.product_uom.id == ref('product.product_uom_meter'), "UOM is not correspond"
             woodmm0 = True
-        elif line.product_id.id == ref('product.product_product_metalcleats0'):                     #METC000      4*3      Unit  
+        elif line.product_id.id == ref('product.product_product_metalcleats0'):                     #METC000      4*3      Unit
             assert not metalcleats, "Production line is already generated for METC000."
             assert line.product_qty == (4*3*factor), "Qty is not correspond."
             assert line.product_uom.id == ref('product.product_uom_unit'), "UOM is not correspond"
@@ -107,7 +107,7 @@
     routing_loc = None
     if order.bom_id.routing_id and order.bom_id.routing_id.location_id:
         routing_loc = order.bom_id.routing_id.location_id.id
-    date_planned = order.date_planned    
+    date_planned = order.date_planned
     for move_line in order.move_lines:
         for order_line in order.product_lines:
             if move_line.product_id.type not in ('product', 'consu'):
@@ -129,18 +129,18 @@
     procurement = self.pool.get('procurement.order')
     order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
     assert order.picking_id, 'Internal Shipment should be created!'
-    
+
     routing_loc = None
     pick_type = 'internal'
-    address_id = False
+    partner_id = False
     if order.bom_id.routing_id and order.bom_id.routing_id.location_id:
         routing_loc = order.bom_id.routing_id.location_id
         if routing_loc.usage <> 'internal':
             pick_type = 'out'
-        address_id = routing_loc.address_id and routing_loc.address_id.id or False
+        partner_id = routing_loc.partner_id and routing_loc.partner_id.id or False
         routing_loc = routing_loc.id
     assert order.picking_id.type == pick_type, "Shipment should be Internal."
-    assert order.picking_id.address_id.id ==  address_id, "Shipment Address is not correspond with Adderss of Routing Location."
+    assert order.picking_id.partner_id.id ==  partner_id, "Shipment Address is not correspond with Adderss of Routing Location."
     date_planned = order.date_planned
     for move_line in order.picking_id.move_lines:
         for order_line in order.product_lines:
@@ -167,7 +167,7 @@
                     assert shipment_procurement.product_uos.id == order_line.product_uos.id, "UOS is not correspond in procurement."
                 assert shipment_procurement.location_id.id == order.location_src_id.id, "Location is not correspond in procurement."
                 assert shipment_procurement.procure_method == order_line.product_id.procure_method, "Procure method is not correspond in procurement."
-   
+
 -
   I change production qty with 3 Dozen Shelf 100cm.
 -
@@ -187,7 +187,7 @@
     assert order.product_qty == 3, "Qty is not changed in order."
     move = order.move_created_ids[0]
     assert move.product_qty == order.product_qty, "Qty is not changed in move line."
--  
+-
   I run scheduler.
 -
   !python {model: procurement.order}: |
@@ -223,7 +223,7 @@
     order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
     for move in order.move_lines:
         move.action_consume(move.product_qty)
-        if move.product_id.id == ref("product.product_product_metalcleats0"): 
+        if move.product_id.id == ref("product.product_product_metalcleats0"):
             move.action_scrap(5.0, scrap_location_id)
 -
   I produce product.
@@ -242,8 +242,8 @@
   !python {model: mrp.production}: |
     order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
     assert order.state == 'done', "Production order should be closed."
-- 
-  I check Total Costs at End of Production. 
+-
+  I check Total Costs at End of Production.
 -
   !python {model: mrp.production}: |
     order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
@@ -275,7 +275,7 @@
                 assert line.journal_id.id == wc.costs_journal_id.id, "Account Journal is not correspond."
                 assert line.product_id.id == wc.product_id.id, "Product is not correspond."
                 assert line.product_uom_id.id == wc.product_id.uom_id.id, "UOM is not correspond."
-            
+
 -
   I print a "BOM Structure".
 -
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index c40b9611fb5..00b4947122e 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -261,17 +261,17 @@
         id="menu_mrp_production_wc_order"
         action="mrp_production_wc_action_form"
         groups="base.group_extended" sequence="2"/>
-    <menuitem name="Work Orders" parent="mrp.menu_mrp_planning"
+    <menuitem name="Work Orders By Resource" parent="mrp.menu_mrp_planning"
         id="menu_mrp_production_wc_action_planning"
         action="mrp_production_wc_action_planning"
         sequence="2"
         icon="STOCK_INDENT"
         groups="base.group_extended"/>
-    <menuitem parent="mrp.menu_mrp_planning"
+   <!-- <menuitem parent="mrp.menu_mrp_planning"
         id="menu_mrp_production_wc_resource_planning"
         action="mrp_production_wc_resource_planning"
         icon="STOCK_INDENT"
-        groups="base.group_extended"/>
+        groups="base.group_extended"/>-->
 
     <!-- Operation codes -->
 
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 2edaba9431a..4a0085e3db9 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -70,12 +70,12 @@ class mrp_repair(osv.osv):
             for line in repair.operations:
                 #manage prices with tax included use compute_all instead of compute
                 if line.to_invoice:
-                    tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id)
+                    tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, line.product_id, repair.partner_id)
                     for c in tax_calculate['taxes']:
                         val += c['amount']
             for line in repair.fees_lines:
                 if line.to_invoice:
-                    tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, repair.partner_invoice_id.id, line.product_id, repair.partner_id)
+                    tax_calculate = tax_obj.compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty,  line.product_id, repair.partner_id)
                     for c in tax_calculate['taxes']:
                         val += c['amount']
             res[repair.id] = cur_obj.round(cr, uid, cur, val)
@@ -117,8 +117,8 @@ class mrp_repair(osv.osv):
         'name': fields.char('Repair Reference',size=24, required=True),
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'),
-        'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
-        'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner.address"),
+        'address_id': fields.many2one('res.partner', 'Delivery Address', domain="[('parent_id','=',partner_id)]"),
+        'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner"),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
@@ -142,7 +142,7 @@ class mrp_repair(osv.osv):
         'guarantee_limit': fields.date('Guarantee limit', help="The guarantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the guarantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='The pricelist comes from the selected partner, by default.'),
-        'partner_invoice_id':fields.many2one('res.partner.address', 'Invoicing Address',  domain="[('partner_id','=',partner_id)]"),
+        'partner_invoice_id':fields.many2one('res.partner', 'Invoicing Address'),
         'invoice_method':fields.selection([
             ("none","No Invoice"),
             ("b4repair","Before Repair"),
@@ -229,12 +229,12 @@ class mrp_repair(osv.osv):
             data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
             data['value']['location_id'] = move.location_dest_id.id
             data['value']['location_dest_id'] = move.location_dest_id.id
-            if move.address_id:
-                data['value']['partner_id'] = move.address_id.partner_id and move.address_id.partner_id.id
+            if move.partner_id:
+                data['value']['partner_id'] = move.partner_id and move.partner_id.id
             else:
                 data['value']['partner_id'] = False
-            data['value']['address_id'] = move.address_id and move.address_id.id
-            d = self.onchange_partner_id(cr, uid, ids, data['value']['partner_id'], data['value']['address_id'])
+            data['value']['partner_id'] = move.partner_id and move.partner_id.id
+            d = self.onchange_partner_id(cr, uid, ids, data['value']['partner_id'], data['value']['partner_id'])
             data['value'].update(d['value'])
         return data
 
@@ -261,7 +261,7 @@ class mrp_repair(osv.osv):
         partner = part_obj.browse(cr, uid, part)
         pricelist = partner.property_product_pricelist and partner.property_product_pricelist.id or False
         return {'value': {
-                    'address_id': address_id or addr['delivery'],
+                    'address_id': addr['delivery'] or addr['default'],
                     'partner_invoice_id': addr['invoice'],
                     'pricelist_id': pricelist
                 }
@@ -389,7 +389,6 @@ class mrp_repair(osv.osv):
                         'type': 'out_invoice',
                         'account_id': account_id,
                         'partner_id': repair.partner_id.id,
-                        'address_invoice_id': repair.address_id.id,
                         'currency_id': repair.pricelist_id.currency_id.id,
                         'comment': repair.quotation_notes,
                         'fiscal_position': repair.partner_id.property_account_position.id
@@ -516,7 +515,7 @@ class mrp_repair(osv.osv):
                     'product_id': move.product_id.id,
                     'product_qty': move.product_uom_qty,
                     'product_uom': move.product_uom.id,
-                    'address_id': repair.address_id and repair.address_id.id or False,
+                    'partner_id': repair.address_id and repair.address_id.id or False,
                     'location_id': move.location_id.id,
                     'location_dest_id': move.location_dest_id.id,
                     'tracking_id': False,
@@ -531,7 +530,7 @@ class mrp_repair(osv.osv):
                     'origin': repair.name,
                     'state': 'draft',
                     'move_type': 'one',
-                    'address_id': repair.address_id and repair.address_id.id or False,
+                    'partner_id': repair.address_id and repair.address_id.id or False,
                     'note': repair.internal_notes,
                     'invoice_state': 'none',
                     'type': 'out',
@@ -543,7 +542,7 @@ class mrp_repair(osv.osv):
                     'product_qty': move.product_uom_qty or 1.0,
                     'product_uom': repair.product_id.uom_id.id,
                     'prodlot_id': repair.prodlot_id and repair.prodlot_id.id or False,
-                    'address_id': repair.address_id and repair.address_id.id or False,
+                    'partner_id': repair.address_id and repair.address_id.id or False,
                     'location_id': repair.location_id.id,
                     'location_dest_id': repair.location_dest_id.id,
                     'tracking_id': False,
@@ -684,7 +683,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         location_id = location_id and location_id[0] or False
 
         if type == 'add':
-            # TOCHECK: Find stock location for user's company warehouse or 
+            # TOCHECK: Find stock location for user's company warehouse or
             # repair order's company's warehouse (company_id field is added in fix of lp:831583)
             args = company_id and [('company_id', '=', company_id)] or []
             warehouse_ids = warehouse_obj.search(cr, uid, args, context=context)
diff --git a/addons/pad_project/i18n/fi.po b/addons/pad_project/i18n/fi.po
new file mode 100644
index 00000000000..941bb5239e4
--- /dev/null
+++ b/addons/pad_project/i18n/fi.po
@@ -0,0 +1,39 @@
+# Finnish 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-03-30 10:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-31 05:08+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Virhe! Tehtävän lopetuspäivän tulee olla myöhäisempi kuin aloituspäivä"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Tehtävä"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index d16907306d1..2d65a09a0f9 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -53,10 +53,10 @@
             <field name="name">Sales Application</field>
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
+            <field name="inherit_id" ref="base.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <field name="module_plugin_outlook" position="after">
-                    <group colspan="2">
+                    <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
                         <button name="%(action_outlook_installer)d" type="action"
                             string="Configure Outlook plugin" icon="gtk-execute"/>
                     </group>
@@ -75,8 +75,8 @@
             <field name="context">{'menu':True}</field>
         </record>
 
-        <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
-        <menuitem id="menu_base_config_plugins_outlook" action="action_outlook_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
+  <!--        <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>-->
+        <menuitem id="menu_base_config_plugins_outlook" action="action_outlook_wizard" parent="base.menu_base_config" sequence="5"/>
 
     </data>
 </openerp>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index ee7fce86d34..233628d5fd5 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -60,10 +60,10 @@
         <field name="name">Sales Application</field>
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="mail.view_sales_config_plugin"/>
+        <field name="inherit_id" ref="base.view_sale_config_settings"/>
         <field name="arch" type="xml">
             <field name="module_plugin_thunderbird" position="after">
-                <group colspan="2">
+                <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
                     <button name="%(action_thunderbird_installer)d" type="action"
                         string="Configure Thunderbird plugin" icon="gtk-execute"/>
                 </group>
@@ -71,8 +71,8 @@
         </field>
     </record>
 
-    <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
-    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config_plugins" sequence="10"/>
+<!--      <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>-->
+    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config" sequence="10"/>
 
   </data>
 </openerp>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 4a88ce3cc16..5af78b131b2 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -50,7 +50,7 @@ class pos_order(osv.osv):
     _name = "pos.order"
     _description = "Point of Sale"
     _order = "id desc"
-    
+
     def create_from_ui(self, cr, uid, orders, context=None):
         #_logger.info("orders: %r", orders)
         list = []
@@ -205,7 +205,7 @@ class pos_order(osv.osv):
             addr = order.partner_id and partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery']) or {}
             picking_id = picking_obj.create(cr, uid, {
                 'origin': order.name,
-                'address_id': addr.get('delivery',False),
+                'partner_id': addr.get('delivery',False),
                 'type': 'out',
                 'company_id': order.company_id.id,
                 'move_type': 'direct',
@@ -414,7 +414,7 @@ class pos_order(osv.osv):
             wf_service.trg_validate(uid, 'pos.order', order.id, 'invoice', cr)
 
         if not inv_ids: return {}
-        
+
         mod_obj = self.pool.get('ir.model.data')
         res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
         res_id = res and res[1] or False
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 1e4b2ec7c35..8d5fdc67d63 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -31,9 +31,7 @@
             <field name="number">SAJ/2010/010</field>
             <field name="journal_id" ref="account.sales_journal"/>
             <field name="currency_id" ref="base.EUR"/>
-            <field name="address_invoice_id" ref="base.res_partner_address_8invoice"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="address_contact_id" ref="base.res_partner_address_8"/>
             <field name="reference_type">none</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="state">open</field>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index f23249c6afc..b397bd826cc 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -748,7 +748,7 @@
         </record>
 
         <!--  Miscelleanous Operations/Reporting -->
-        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager"/>
+        <menuitem name="Point of Sale" parent="base.menu_reporting" id="menu_point_rep" sequence="50" groups="group_pos_manager"/>
         <!-- Invoice -->
 
         <record model="ir.actions.act_window" id="action_pos_sale_all">
@@ -770,8 +770,10 @@
             <field name="domain">[('origin','like','POS')]</field>
         </record>
 
+		<menuitem name="Reporting" id="menu_point_of_sale_reporting" parent="menu_point_root" sequence="20" />
+		
         <menuitem icon="STOCK_PRINT" action="action_report_pos_details"
-                id="menu_pos_details" parent="menu_point_rep" sequence="6" />
+                id="menu_pos_details" parent="menu_point_of_sale_reporting" sequence="6" />
 
         <record model="ir.actions.client" id="action_pos_pos">
           <field name="name">Start Point of Sale</field>
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index 721f4bc86e2..93604e755e0 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -42,7 +42,7 @@ class order(report_sxw.rml_parse):
             'disc': self.discount,
             'net': self.netamount,
             'get_journal_amt': self._get_journal_amt,
-            'address': partner.address and partner.address[0] or False,
+            'address': partner or False,
             'titlize': titlize
         })
 
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 640a33d325b..7f2e91f1b48 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_point_of_sale"/>
         <field name="implied_ids" eval="[(4, ref('group_pos_user')), (4, ref('stock.group_stock_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 11bc8b33558..31e35d3fa10 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -52,9 +52,9 @@ class pos_open_statement(osv.osv_memory):
             ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
 
             if journal.sequence_id:
-                number = sequence_obj.next_by_id(cr, uid, journal.sequence_id.id)
+                number = sequence_obj.next_by_id(cr, uid, journal.sequence_id.id, context=context)
             else:
-                number = sequence_obj.next_by_code(cr, uid, 'account.cash.statement')
+                number = sequence_obj.next_by_code(cr, uid, 'account.cash.statement', context=context)
 
             data.update({
                 'journal_id': journal.id,
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 30b16a717d4..0e5d4e1fbb5 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -53,8 +53,8 @@ class pos_return(osv.osv_memory):
         for order in order_obj.browse(cr, uid, active_ids, context=context):
             for line in order.lines:
                 result.append({
-                            'product_id' : line.product_id.id, 
-                            'quantity' : line.qty, 
+                            'product_id' : line.product_id.id,
+                            'quantity' : line.qty,
                             'line_id':line.id
                         })
             res.update({'pos_moves_ids': result})
@@ -93,7 +93,7 @@ class pos_return(osv.osv_memory):
             'type': 'ir.actions.act_window',
         }
     def create_returns2(self, cr, uid, ids, context=None):
-       
+
         if context is None:
             context = {}
         active_id = context.get('active_id', False)
@@ -113,7 +113,7 @@ class pos_return(osv.osv_memory):
             for order_id in order_obj.browse(cr, uid, [active_id], context=context):
                 source_stock_id = property_obj.get(cr, uid, 'property_stock_customer', 'res.partner', context=context).id
                 cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
-                            "WHERE w.lot_stock_id=s.id AND w.id=%s ", 
+                            "WHERE w.lot_stock_id=s.id AND w.id=%s ",
                             (order_id.shop_id.warehouse_id.id,))
                 res = cr.fetchone()
                 location_id = res and res[0] or None
@@ -121,7 +121,7 @@ class pos_return(osv.osv_memory):
                                                                                'move_lines': [],
                                                                                'state':'draft',
                                                                                'type': 'in',
-                                                                               'address_id': order_id.partner_id.id,
+                                                                               'partner_id': order_id.partner_id.id,
                                                                                'date': date_cur })
                 new_order = order_obj.copy(cr, uid, order_id.id, {'name': 'Refund %s'%order_id.name,
                                                               'lines':[],
@@ -268,7 +268,7 @@ class add_product(osv.osv_memory):
         wf_service = netsvc.LocalService("workflow")
         self_data = self.browse(cr, uid, ids, context=context)[0]
         order_obj.add_product(cr, uid, active_ids[0], self_data.product_id.id, self_data.quantity, context=context)
-        
+
         for order_id in order_obj.browse(cr, uid, active_ids, context=context):
             stock_dest_id = property_obj.get(cr, uid, 'property_stock_customer', 'res.partner', context=context).id
             cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
@@ -287,7 +287,7 @@ class add_product(osv.osv_memory):
                         })
             for line in order_id.lines:
                 key= 'return%s' % line.id
-                if line.id: 
+                if line.id:
                     if data.has_key(key):
                         qty = data[key]
                         lines_obj.write(cr,uid,[line.id], {
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 4b73db5cdcc..0c0213ec56a 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -17,6 +17,7 @@
             <field name="comment">Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.</field>
             <field name="category_id" ref="module_category_portal"/>
             <field name="implied_ids" eval="[(4, ref('group_portal_officer'))]"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 706d6fd4a7f..0eceec3f46b 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -94,27 +94,21 @@ class wizard(osv.osv_memory):
             return {    # a user config based on a contact (address)
                 'name': address.name,
                 'user_email': extract_email(address.email),
-                'lang': address.partner_id and address.partner_id.lang or 'en_US',
-                'partner_id': address.partner_id and address.partner_id.id,
+                'lang': address.parent_id and address.parent_id.lang or 'en_US',
+                'partner_id': address.parent_id and address.parent_id.id,
             }
         
         user_ids = []
-        if context.get('active_model') == 'res.partner.address':
-            address_obj = self.pool.get('res.partner.address')
-            address_ids = context.get('active_ids', [])
-            addresses = address_obj.browse(cr, uid, address_ids, context)
-            user_ids = map(create_user_from_address, addresses)
-        
-        elif context.get('active_model') == 'res.partner':
+        if context.get('active_model') == 'res.partner':
             partner_obj = self.pool.get('res.partner')
             partner_ids = context.get('active_ids', [])
             partners = partner_obj.browse(cr, uid, partner_ids, context)
             for p in partners:
                 # add one user per contact, or one user if no contact
-                if p.address:
-                    user_ids.extend(map(create_user_from_address, p.address))
+                if p.child_ids:
+                    user_ids.extend(map(create_user_from_address, p.child_ids))
                 else:
-                    user_ids.append({'lang': p.lang or 'en_US', 'partner_id': p.id})
+                    user_ids.append({'lang': p.lang or 'en_US', 'parent_id': p.id})
         
         return user_ids
 
@@ -151,6 +145,7 @@ class wizard(osv.osv_memory):
                     'password': random_password(),
                     'user_email': u.user_email,
                     'context_lang': u.lang,
+                    'share': True,
                     'partner_id': u.partner_id and u.partner_id.id,
                 } for u in wiz.user_ids if u.user_email not in existing_logins ]
             portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 537055e5fb2..7f36272720c 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -10,15 +10,6 @@
             key2="client_action_multi" target="new"
             groups="group_portal_officer"/>
 
-        <!-- wizard action on res.partner.address -->
-        <act_window id="address_wizard_action"
-            name="Add Portal Access"
-            src_model="res.partner.address"
-            res_model="res.portal.wizard"
-            view_type="form" view_mode="form"
-            key2="client_action_multi" target="new"
-            groups="group_portal_officer"/>
-
         <!-- wizard view -->
         <record id="wizard_view" model="ir.ui.view">
             <field name="name">Add Portal Access</field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 518a8900072..6ce26ecb98c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -273,7 +273,7 @@
             <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
             <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
-            <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="menu_stock_procurement" sequence="10"/>
+            <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
 
 
         <record id="product_normal_form_view" model="ir.ui.view">
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index a3ea80dc782..446463ecf4d 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -267,7 +267,8 @@ class procurement_order(osv.osv):
                         if op.procurement_draft_ids:
                         # Check draft procurement related to this order point
                             pro_ids = [x.id for x in op.procurement_draft_ids]
-                            procure_datas = procurement_obj.read(cr, uid, pro_ids, ['id','product_qty'], context=context, order='product_qty desc')
+                            procure_datas = procurement_obj.read(
+                                cr, uid, pro_ids, ['id', 'product_qty'], context=context)
                             to_generate = qty
                             for proc_data in procure_datas:
                                 if to_generate >= proc_data['product_qty']:
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 117d559ddec..9b4d2cadee1 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -55,7 +55,6 @@ Print product labels with barcode.
         'product_data.xml',
         'product_report.xml',
         'product_view.xml',
-        'wizard/product_installer.xml',
         'product_shortcut_data.xml',
         'pricelist_view.xml',
         'partner_view.xml',
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index c36f2082ff5..0388b2a4aa3 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -5,7 +5,7 @@
         <menuitem id="base.menu_sale_config_sales" name="Sales"
             parent="base.menu_base_config" sequence="0" groups="base.group_extended"/>
         <menuitem id="menu_product_pricelist_main" name="Pricelists" 
-            parent="base.menu_base_config" groups="product.group_sale_pricelist" sequence="50"/>
+            parent="base.menu_base_config" groups="product.group_sale_pricelist" sequence="70"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
@@ -181,7 +181,7 @@
         </record>
         <menuitem
             action="product_pricelist_action2" id="menu_product_pricelist_action2"
-            parent="product.menu_product_pricelist_main" sequence="1"/>
+            parent="base.menu_base_config" sequence="20"/>
 
         <record id="product_price_type_view" model="ir.ui.view">
             <field name="name">product.price.type.form</field>
@@ -207,7 +207,7 @@
 
         <menuitem
             action="product_price_type_action" id="menu_product_price_type"
-            parent="product.menu_product_pricelist_main" sequence="4"/>
+            parent="product.menu_product_pricelist_main" sequence="4" groups="base.group_no_one"/>
 
         <!-- Moved to extra module 'sale_pricelist_type_menu':
         <record id="product_pricelist_type_view" model="ir.ui.view">
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 54c016ee543..c99de86c5da 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem groups="base.group_extended" id="prod_config_main" name="Products" parent="base.menu_base_config" sequence="9"/>
+        <menuitem groups="base.group_extended" id="prod_config_main" name="Products" parent="base.menu_base_config" sequence="70"/>
 
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
@@ -123,13 +123,13 @@
                                 <field name="product_manager"/>
                             </group>
 
-                            <group colspan="2" col="2" name="uom">
+                            <group colspan="2" col="2" name="uom" groups="product.group_uom">
                                 <separator string="Unit of Measure" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
-                                <field name="uom_po_id" groups="base.group_extended"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                <field name="uom_po_id"/>
                             </group>
 
-                            <group colspan="2" col="2" name="uos" groups="product.group_uom">
+                            <group colspan="2" col="2" name="uos" groups="product.group_uos">
                                 <separator string="Second UoM" colspan="2"/>
                                 <field name="uos_id"/>
                                 <field name="uos_coeff"/>
@@ -362,7 +362,7 @@
             <field name="view_id" ref="product_category_list_view"/>
         </record>
         <menuitem action="product_category_action_form"
-            groups="base.group_extended"
+            groups="base.group_no_one"
             id="menu_product_category_action_form"
             parent="prod_config_main" sequence="2"/>
 
@@ -440,8 +440,8 @@
             <field name="view_id" ref="product_uom_tree_view"/>
             <field name="help">Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category.</field>
         </record>
-        <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="65" groups="product.group_uom"/>
-        <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
+        <menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="30" groups="product.group_uom"/>
+        <menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="base.menu_base_config" sequence="30"/>
 
         <record id="product_uom_categ_form_view" model="ir.ui.view">
             <field name="name">product.uom.categ.form</field>
@@ -461,7 +461,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help">Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category "Time", you will have the following UoM: Hours, Days.</field>
         </record>
-        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/>
+        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25"/>
 
         <record id="product_ul_form_view" model="ir.ui.view">
             <field name="name">product.ul.form.view</field>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 8f255470e95..d0f1cd81d5e 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -2,11 +2,6 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_uos" context="{'noadmin':True}" model="res.groups">
-        <field name="name">Product UoS View</field>
-        <field name="category_id" ref="base.module_category_usability"/>
-    </record>
-
     <record id="product_comp_rule" model="ir.rule">
         <field name="name" >Product multi-company</field>
         <field name="model_id" ref="model_product_template"/>
@@ -14,7 +9,7 @@
         <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
     </record>
 
-    <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
+    <record id="group_product_variant" model="res.groups">
         <field name="name">Product Variant</field>
         <field name="category_id" ref="base.module_category_usability"/>
     </record>
@@ -30,7 +25,12 @@
     </record>
 
     <record id="group_uom" model="res.groups">
-        <field name="name">Multiple UoM per Product</field>
+        <field name="name">Manage Multiple Units of Measure</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
+    <record id="group_uos" context="{'noadmin':True}" model="res.groups">
+        <field name="name">Manage Secondary UoM</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
@@ -39,6 +39,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_mrp_properties" model="res.groups">
+        <field name="name">Manage Properties of Product</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record model="ir.rule" id="product_pricelist_comp_rule">
         <field name="name">product pricelist company rule</field>
         <field name="model_id" ref="model_product_pricelist"/>
diff --git a/addons/product/wizard/product_installer.xml b/addons/product/wizard/product_installer.xml
deleted file mode 100644
index 01ddf25c56c..00000000000
--- a/addons/product/wizard/product_installer.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<openerp>
-    <data>
-
-         <record id="product_form_config_action" model="ir.actions.act_window">
-            <field name="name">Create or Import Products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.product</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="product.product_product_tree_view"/>
-            <field name="help">Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased.</field>
-        </record>
-        
-         <!--      register configuration wizard -->
-        <record id="config_wizard_res_product_installer" model="ir.actions.todo">
-            <field name="action_id" ref="product_form_config_action"/>
-            <field name="category_id" ref="base.category_sales_management_config"/>
-            <field name="sequence">20</field>
-        </record>
-        
-    </data>
-</openerp>
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 8b1f2d279b0..6c083bca6b0 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -88,7 +88,8 @@
             </field>
         </record>
 
-  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product"/>
+  <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="10"/>
+  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.next_id_73"/>
 
 </data>
 </openerp>
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 2f4070db381..5d833ea6b53 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -103,8 +103,8 @@ sale_order_line()
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
-        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context, company_id=company_id)
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
+        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit,currency_id, context=context, company_id=company_id)
 
         def get_real_price(res_dict, product_id, qty, uom, pricelist):
             item_obj = self.pool.get('product.pricelist.item')
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 3288910d587..35b920828b2 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -52,7 +52,6 @@ Dashboard for project members that includes:
         "project_data.xml",
         "project_view.xml",
         "process/task_process.xml",
-        "project_installer.xml",
         "res_partner_view.xml",
         "report/project_report_view.xml",
         "board_project_view.xml",
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 88424be85fa..f4a855283ba 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -104,16 +104,17 @@
         </record>
 
         <menuitem
-            id="next_id_86"
-            name="Dashboard"
-            sequence="0"
-            parent="base.menu_project_report"/>
+            id="menu_project_dashboard"
+            name="Project"
+            sequence="20"
+            parent="base.menu_reporting_dashboard"
+            />
 
         <menuitem
             action="open_board_project"
             icon="terp-graph"
             id="menu_board_project"
-            parent="next_id_86"
+            parent="menu_project_dashboard"
             sequence="1"/>
 
         <menuitem
diff --git a/addons/project/project.py b/addons/project/project.py
index 9966ad02ee8..af21e679f30 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -75,9 +75,8 @@ class project(osv.osv):
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         partner_obj = self.pool.get('res.partner')
         if not part:
-            return {'value':{'contact_id': False}}
-        addr = partner_obj.address_get(cr, uid, [part], ['contact'])
-        val = {'contact_id': addr['contact']}
+            return {'value':{}}
+        val = {}
         if 'pricelist_id' in self.fields_get(cr, uid, context=context):
             pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context)
             pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
deleted file mode 100644
index 338040df5e2..00000000000
--- a/addons/project/project_installer.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-
-        <record id="category_project_config" model="ir.actions.todo.category">
-            <field name="name">Project Management</field>
-            <field name="sequence">7</field>
-        </record>
-
-        <record id="action_create_initial_projects_installer" model="ir.actions.act_window">
-            <field name="name">Create your Firsts Projects</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">project.project</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <record id="config_wizard_action_create_initial_projects_installer" model="ir.actions.todo">
-            <field name="action_id" ref="action_create_initial_projects_installer"/>
-            <field name="category_id" ref="category_project_config" />
-        </record>
-
-        <record id="action_review_task_stage" model="ir.actions.act_window">
-            <field name="name">Review Task Stages</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">project.task.type</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_common': 1, 'default_project_default': 1}</field>
-            <field name="domain">[]</field>
-            <field name="help">The stages can be common to all project or specific to one project. Each task will follow the different stages in order to be closed.</field>
-        </record>
-
-        <record id="config_wizard_action_review_task_stage" model="ir.actions.todo">
-            <field name="action_id" ref="action_review_task_stage"/>
-            <field name="category_id" ref="category_project_config" />
-        </record>
-    </data>
-</openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 26abe86fe99..95538513f0c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -69,7 +69,6 @@
                         </page>
                         <page string="Billing" groups="account.group_account_invoice">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
                             <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
@@ -173,7 +172,7 @@
             <field name="view_mode">tree,form,gantt</field>
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
-            <field name="context">{'search_default_Current':1}</field>
+            <field name="context">{}</field>
             <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
         </record>
 
@@ -291,7 +290,7 @@
                                 <field name="priority"/>
                                 <field name="sequence"/>
                             </group>
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_no_one">
                                 <separator string="Dates" colspan="2"/>
                                 <field name="date_start"/>
                                 <field name="date_end"/>
@@ -354,7 +353,8 @@
                                             <field name="name"/>
                                         </td>
                                         <td valign="top" width="22">
-                                            <img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>
+                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
+                                            width="22" height="22" class="oe_kanban_gravatar"/>
                                         </td>
                                     </tr>
                                     </table>
@@ -430,8 +430,8 @@
                         icon="gtk-go-forward"
                         groups="base.group_extended"
                         help="Change Type"/>
-                    <field name="date_start" invisible="1"/>
-                    <field name="date_end" invisible="1"/>
+                    <field name="date_start" invisible="1" groups="base.group_no_one"/>
+                    <field name="date_end" invisible="1" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
@@ -510,9 +510,9 @@
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
-                        <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
+                        <separator orientation="vertical" groups="base.group_no_one"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
+                        <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
@@ -525,7 +525,7 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_draft": 1, "search_default_open":1, "search_default_project_id": project_id}</field>
+            <field name="context">{"search_default_project_id": project_id}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
@@ -540,7 +540,7 @@
             <field name="act_window_id" ref="action_view_task"/>
         </record>
 
-        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="3"/>
+        <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="5"/>
 
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
@@ -622,12 +622,12 @@
             <field name="help">Define the steps that will be used in the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress in solving a task or an issue.</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="menu_tasks_config" name="GTD" parent="project.menu_definitions" sequence="1"/>
 
         <menuitem id="menu_project_config_project" name="Projects and Stages" parent="menu_definitions" sequence="1"/>
 
-        <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1"/>
+        <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2" groups="base.group_no_one"/>
+        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1" groups="base.group_no_one"/>
 
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
@@ -676,7 +676,7 @@
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
             <group name="default_filters" position="inside">
-                <field name="context_project_id" context="{'user_preference':True}" widget="selection"/>
+                <field name="context_project_id" context="{'user_preference':True}" widget="selection" readonly="0"/>
             </group>
        </field>
     </record>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 5af8706108f..87f563f8878 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -2,10 +2,10 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_project_report" name="Reporting"
+        <menuitem id="base.menu_project_report" name="Project"
             groups="project.group_project_manager"
-            parent="base.menu_main_pm" sequence="50"/>
-        <menuitem id="project_report_task" name="Tasks"
+            parent="base.menu_reporting" sequence="25"/>
+        <menuitem id="project_report_task" name="Tasks Analysis"
             parent="base.menu_project_report"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index d1b6f3f5d32..17f3a1cfbb5 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -26,33 +26,26 @@ class project_configuration(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_project_mrp': fields.boolean('Create tasks directly from a sale order',
-            help ="""Automatically creates project tasks from procurement lines of type 'service'.
+        'module_project_mrp': fields.boolean('Create Tasks from a Sale Order',
+            help ="""This feature automatically creates project tasks from service products in sale orders.
+                More precisely, tasks are created for procurement lines with product of type 'Service',
+                procurement method 'Make to Order', and supply method 'Produce'.
                 This installs the module project_mrp."""),
-        'module_pad': fields.boolean("Write task specifications on collaborative note pads",
+        'module_pad': fields.boolean("Use Collaborative Note Pads for Tasks",
             help="""Lets the company customize which Pad installation should be used to link to new pads
                 (by default, http://ietherpad.com/).
                 This installs the module pad."""),
-        'module_project_timesheet': fields.boolean("Invoice working time on tasks",
+        'module_project_timesheet': fields.boolean("Timesheets and Invoices",
             help="""This allows you to transfer the entries under tasks defined for Project Management to
                 the timesheet line entries for particular date and user, with the effect of creating,
                 editing and deleting either ways.
                 This installs the module project_timesheet."""),
-        'module_project_scrum': fields.boolean("Manage your project following Agile methodology",
-            help="""This allows to implement all concepts defined by the scrum project management methodology for IT companies.
-                    * Project with sprints, product owner, scrum master;
-                    * Sprints with reviews, daily meetings, feedbacks;
-                    * Product backlog;
-                    * Sprint backlog.
-                This installs the module project_scrum."""),
-        'module_project_planning' : fields.boolean("Manage planning",
-            help="""This module helps you to manage your plannings.
-                Each department manager can know whether someone in their team has still unallocated time for a given
-                planning (taking into consideration the validated leaves), or whether he/she still needs to encode tasks.
-                This installs the module project_planning."""),
-        'module_project_long_term': fields.boolean("Manage long term planning",
+        'module_project_long_term': fields.boolean("Manage Gantt and Resource Planning",
             help="""A long term project management module that tracks planning, scheduling, and resource allocation.
                 This installs the module project_long_term."""),
+        'module_project_issue': fields.boolean("Issues and Bug Tracking",
+            help="""Provides management of issues/bugs in projects.
+                This installs the module project_issue."""),
         'module_project_issue_sheet': fields.boolean("Track and invoice issues working time",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 99ea3d5e26b..fa2d139b99a 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,15 +12,19 @@
                     <field name="module_project_mrp"/>
                     <field name="module_project_timesheet"/>
                     <field name="module_pad"/>
-                    <field name="module_project_scrum"/>
 
                     <separator string="Planning" colspan="4"/>
-                    <field name="module_project_planning"/>
                     <field name="module_project_long_term"/>
 
                     <separator string="Helpdesk and support" colspan="4"/>
-                    <group name="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"/>
                 </form>
             </field>
         </record>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 3dc9cdbab46..5b51dc85e7c 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -8,7 +8,6 @@ access_report_project_task_user,report.project.task.user,model_report_project_ta
 access_project_vs_hours,project.vs.hours,model_project_vs_hours,project.group_project_user,1,1,1,1

 access_task_by_days,task.by.days,model_task_by_days,project.group_project_user,1,1,1,1

 access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0

-access_partner_address_task user,base.res.partner.address user,base.model_res_partner_address,project.group_project_user,1,0,0,0

 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0

 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0

 access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,0,0,0

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f1e3a6e9b74..a1ead6aa72c 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -11,6 +11,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_project_management"/>
         <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record model="ir.ui.menu" id="menu_definitions">
diff --git a/addons/project/wizard/mail_compose_message.py b/addons/project/wizard/mail_compose_message.py
index 82d67ea9b92..1609cc04c1c 100644
--- a/addons/project/wizard/mail_compose_message.py
+++ b/addons/project/wizard/mail_compose_message.py
@@ -41,7 +41,7 @@ class mail_compose_message(osv.osv_memory):
             partner = task_data.partner_id or task_data.project_id.partner_id
             if task_data.project_id.warn_manager and (not task_data.project_id.user_id or task_data.project_id.user_id and not task_data.project_id.user_id.user_email) :
                 raise osv.except_osv(_('Error'), _("Please specify the Project Manager or email address of Project Manager."))
-            elif task_data.project_id.warn_customer and (not partner or not len(partner.address) or (partner and len(partner.address) and not partner.address[0].email)):
+            elif task_data.project_id.warn_customer and (not partner or (partner and not partner.email)):
                 raise osv.except_osv(_('Error'), _("Please specify the Customer or email address of Customer."))
 
             result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False})
@@ -56,8 +56,8 @@ class mail_compose_message(osv.osv_memory):
             header = (task_data.project_id.warn_header or '') % val
             footer = (task_data.project_id.warn_footer or '') % val
             description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature)
-            if partner and len(partner.address):
-                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].email})
+            if partner :
+                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.email})
             result.update({
                        'body_text': description or False,
                        'email_to':   task_data.project_id.user_id and task_data.project_id.user_id.user_email or False,
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 66e7a8a69e3..5f2267ec4b1 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -32,7 +32,7 @@
     </record>
 
     <menuitem name="Contexts" id="menu_open_gtd_time_contexts"
-                parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
+                parent="project.menu_tasks_config" action="open_gtd_context_tree" groups="base.group_no_one"/>
 
     <record model="ir.ui.view" id="view_gtd_timebox_tree">
         <field name="name">project.gtd.timebox.tree</field>
@@ -70,7 +70,7 @@
         <field name="help">Timeboxes are defined in the "Getting Things Done" methodology. A timebox defines a period of time in order to categorize your tasks: today, this week, this month, long term.</field>
     </record>
 
-    <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="project.menu_tasks_config" action="open_gtd_timebox_tree"/>
+    <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="project.menu_tasks_config" action="open_gtd_timebox_tree" groups="base.group_no_one"/>
 
     <record model="ir.ui.view" id="project_task_tree">
         <field name="name">project.task.tree.timebox</field>
@@ -140,7 +140,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
     </record>
-    <menuitem action="open_gtd_task" id="menu_open_gtd_timebox_tree" parent="project.menu_project_management" sequence="4"/>
+    <menuitem action="open_gtd_task" id="menu_open_gtd_timebox_tree" parent="project.menu_project_management" sequence="10"/>
 
 
     </data>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 827548f131e..ff33793d8e8 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -79,7 +79,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_issue_form"/>
         </record>
-        <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
+        <menuitem id="menu_dashboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dashboard"
              icon="terp-graph"
             action="open_board_project_issue"/>
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b950bfd0b34..408ef10cb78 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -204,8 +204,6 @@ class project_issue(crm.crm_case, osv.osv):
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
         'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
@@ -264,7 +262,6 @@ class project_issue(crm.crm_case, osv.osv):
     _defaults = {
         'active': 1,
         'partner_id': crm.crm_case._get_default_partner,
-        'partner_address_id': crm.crm_case._get_default_partner_address,
         'email_from': crm.crm_case._get_default_email,
         'state': 'draft',
         'section_id': crm.crm_case._get_section,
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index f1c7dd5eb4d..358e9e55aa5 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -3,7 +3,6 @@
 <data noupdate="1">
 
     <record id="crm_case_buginaccountsmodule0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_8"/>
         <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
         <field eval="&quot;5&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -20,7 +19,6 @@
     </record>
 
     <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_tang"/>
         <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
         <field eval="&quot;3&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -36,7 +34,6 @@
     </record>
 
     <record id="crm_case_outputincorrect0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_9"/>
         <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
         <field eval="&quot;4&quot;" name="priority"/>
         <field name="user_id" ref="base.user_demo"/>
@@ -51,7 +48,6 @@
     </record>
 
     <record id="crm_case_problemloadingpage0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_13"/>
         <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
         <field eval="&quot;3&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -82,7 +78,6 @@
     </record>
 
     <record id="crm_case_programmingerror0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_10"/>
         <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
         <field eval="&quot;3&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -98,7 +93,6 @@
     </record>
 
     <record id="crm_case_logicalerrorinprogram0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_6"/>
         <field eval="time.strftime('%Y-%m-26  11:10:00')" name="date"/>
         <field eval="&quot;2&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -114,7 +108,6 @@
     </record>
 
     <record id="crm_case_constrainterror0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_6"/>
         <field eval="time.strftime('%Y-%m-25  13:35:00')" name="date"/>
         <field eval="&quot;2&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -130,7 +123,6 @@
     </record>
 
     <record id="crm_case_errorinprogram0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_10"/>
         <field eval="time.strftime('%Y-%m-28  15:40:00')" name="date"/>
         <field eval="&quot;2&quot;" name="priority"/>
         <field name="user_id" ref="base.user_demo"/>
@@ -145,7 +137,6 @@
     </record>
 
     <record id="crm_case_patcheserrorinprogram0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_9"/>
         <field eval="time.strftime('%Y-%m-28  16:30:00')" name="date"/>
         <field eval="&quot;2&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -161,7 +152,6 @@
     </record>
 
     <record id="crm_case_newfeaturestobeadded0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_wong"/>
         <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
         <field eval="&quot;4&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -177,7 +167,6 @@
     </record>
 
     <record id="crm_case_addmenustothemodule0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_1"/>
         <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
         <field eval="&quot;1&quot;" name="priority"/>
         <field name="user_id" ref="base.user_demo"/>
@@ -194,7 +183,6 @@
     </record>
 
     <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_2"/>
         <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
         <field eval="&quot;3&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -211,7 +199,6 @@
     </record>
 
     <record id="crm_case_createnewobject0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_6"/>
         <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
         <field eval="&quot;3&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -227,7 +214,6 @@
     </record>
 
     <record id="crm_case_improvereportsinhrms0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_15"/>
         <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
         <field eval="&quot;4&quot;" name="priority"/>
         <field name="user_id" ref="base.user_root"/>
@@ -243,7 +229,6 @@
     </record>
 
     <record id="crm_case_improvereportsinpms0" model="project.issue">
-        <field name="partner_address_id" ref="base.res_partner_address_15"/>
         <field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
         <field eval="&quot;2&quot;" name="priority"/>
         <field name="user_id" ref="base.user_demo"/>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 9d88418720b..ea52d4c06d9 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -11,7 +11,7 @@
         <field name="view_mode">kanban,tree,calendar</field>
         <field name="view_id" eval="False"/>
         <field name="domain" eval=""/>
-        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1, "search_default_project_id":project_id}</field>
+        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1,"search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
     </record>
@@ -54,6 +54,6 @@
             view_type="form"/>
 
     <menuitem name="Issues" id="menu_project_issue_track"  parent="project.menu_project_management"
-            action="project_issue_categ_act0" sequence="4"/>
+            action="project_issue_categ_act0" sequence="15"/>
 </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index d50501279fd..df0797da6bb 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -32,7 +32,7 @@
             <field name="view_type">form</field>
             <field name="help">You can use the issues tracker in OpenERP to handle bugs in the software development project, to handle claims in after-sales services, etc. Define here the different versions of your products on which you can work on issues.</field>
         </record>
-        <menuitem action="project_issue_version_action" id="menu_project_issue_version_act" parent="menu_project_confi" />
+        <menuitem action="project_issue_version_action" id="menu_project_issue_version_act" parent="menu_project_confi" groups="base.group_no_one"/>
 
         <record id="project_issue_categ_action" model="ir.actions.act_window">
             <field name="name">Issue Categories</field>
@@ -43,7 +43,7 @@
             <field name="context" eval="{'object_id': ref('model_project_issue')}"/>
         </record>
 
-        <menuitem action="project_issue_categ_action" name="Categories" id="menu_project_issue_category_act" parent="menu_project_confi" />
+        <menuitem action="project_issue_categ_action" name="Categories" id="menu_project_issue_category_act" parent="menu_project_confi" groups="base.group_no_one"/>
 
         <record model="ir.ui.view" id="project_issue_form_view">
             <field name="name">Project Issue Tracker Form</field>
@@ -68,7 +68,6 @@
                             <group col="2" colspan="2">
                             <separator colspan="2" string="Contact Information"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
-                            <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
                             <field name="email_from"/>
                             </group>
                             <group col="3" colspan="2">
@@ -94,7 +93,7 @@
                         </page>
                         <page string="Communication &amp; History" groups="base.group_extended">
                             <group colspan="4">
-                            <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
+                            <field colspan="4" name="email_cc" string="Global CC" widget="email"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                                 <tree string="History">
@@ -116,23 +115,23 @@
                                 name="%(mail.action_email_compose_message_wizard)d"
                                 icon="terp-mail-message-new" type="action"/>
                         </page>
-                           <page string="Extra Info" groups="base.group_extended">
+                           <page string="Extra Info" groups="base.group_no_one">
                             <group col="2" colspan="2">
-                            <separator colspan="2" string="Date"/>
-                            <field name="create_date"/>
-                            <field name="write_date" />
-                            <field name="date_closed"/>
-                            <field name="date_open"/>
-                            <field name="date_action_last"/>
+                                <separator colspan="2" string="Date"/>
+                               <field name="create_date"/>
+                                <field name="write_date" />
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                                <field name="date_action_last"/>
                             </group>
                             <group colspan="2" col="2">
-                            <separator string="Statistics" colspan="2" col="2"/>
-                            <field name="day_open"/>
-                            <field name="day_close"/>
-                            <field name="working_hours_open" widget="float_time"/>
-                            <field name="working_hours_close" widget="float_time"/>
-                            <field name="inactivity_days"/>
-                            <field name="days_since_creation"/>
+                                <separator string="Statistics" colspan="2" col="2"/>
+                                <field name="day_open"/>
+                                <field name="day_close"/>
+                                <field name="working_hours_open" widget="float_time"/>
+                                <field name="working_hours_close" widget="float_time"/>
+                                <field name="inactivity_days"/>
+                                <field name="days_since_creation"/>
                             </group>
                             <group colspan="2" col="2">
                             <separator string="References" colspan="2"/>
@@ -152,7 +151,7 @@
             <field name="arch" type="xml">
                 <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
                     <field name="id"/>
-                    <field name="create_date"/>
+                    <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
                     <field name="partner_id" groups="base.group_extended"/>
                     <field name="project_id" />
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index 8e4a343292e..1944444923a 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index fb522d08352..e25d5e34e3e 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -11,7 +11,7 @@
                     <attribute name="on_change">on_change_project(project_id)</attribute>
                 </field>
                 <xpath expr="/form/notebook" position="before">
-                    <field invisible="1" name="analytic_account_id"
+                    <field name="analytic_account_id"
                         domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
                         on_change='on_change_account_id(analytic_account_id)'
                         groups="base.group_extended" />
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 23ae8139bea..9800c209dd5 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    <menuitem id="base.menu_project_long_term" name="Planning" parent="base.menu_main_pm" sequence="1"/>
+    <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="3"/>
 
     # ------------------------------------------------------
     # Project User Allocation
@@ -124,7 +124,7 @@
                                   </tree>
                                   <form string="Project Users">
                                     <field name="user_id"/>
-                                    <field name="date_start" /> 
+                                    <field name="date_start" />
                                     <field name="date_end"/>
                                   </form>
                              </field>
@@ -252,7 +252,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-            <field name="context">{"search_default_current": 1}</field>
+            <field name="context">{}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">A project can be split into the different phases. For each phase, you can define your users allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available users, convert your phases into a series of tasks when you start working on the project.</field>
         </record>
@@ -262,7 +262,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
-             <field name="context">{"search_default_current": 1}</field>
+             <field name="context">{}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
@@ -334,7 +334,7 @@
         res_model="project.phase"
         src_model="project.project"
         view_mode="tree,form"
-        view_type="form" 
+        view_type="form"
         />
 
     # ------------------------------------------------------
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 85e2c02f8ff..127209c2e35 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -100,6 +100,6 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="project_messages.view_project_message_tree"/>
        </record>
-       <menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management" groups="project.group_project_user"/>
+  <!--<menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management" groups="project.group_project_user"/> -->
      </data>
 </openerp>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 83da24292ae..d12b62dbf18 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -214,8 +214,8 @@
             <field name="help">With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability.</field>
         </record>
 <!--        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
-        <menuitem id="base.menu_project_long_term" name="Long Term Planning"
-            parent="base.menu_main_pm" />
+        <menuitem id="base.menu_project_long_term" name="Planning"
+            parent="base.menu_main_pm" sequence="3"/>
 
         <menuitem action="action_account_analytic_planning_form"
             id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager"/>
@@ -292,14 +292,11 @@
             <!-- <field name="context">{"search_default_user_id":uid}</field> -->
             <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
         </record>
-        <menuitem id="next_id_85" name="Planning"
-            parent="hr.menu_hr_reporting" />
-        <menuitem action="action_account_analytic_planning_stat_form"
-            id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
+
             <menuitem  action="action_account_analytic_planning_stat_form"
                        icon="terp-graph"
                        id="menu_board_planning"
-                       parent="project.next_id_86"/>
+                       parent="project.menu_project_dashboard"/>
 
 <!--        Analytic account Form -->
 
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index dd01832b575..924a1cbf5cc 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -98,7 +98,7 @@
         </record>
         <menuitem
             id="menu_deshboard_scurm"
-            name="Scrum Dashboard" parent="project.next_id_86"
+            name="Scrum Dashboard" parent="project.menu_project_dashboard"
             icon="terp-graph"
             action="open_board_project_scrum"/>
 
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 7dc2cc1d4f0..7fb84f12213 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -4,7 +4,7 @@
 
         <menuitem id="menu_scrum"
             name="Scrum"
-            parent="base.menu_main_pm" sequence="3"/>
+            parent="base.menu_main_pm" sequence="7"/>
 
         <!-- Scrum Project -->
 
@@ -178,7 +178,7 @@
             <field name="name">Product Backlogs</field>
             <field name="res_model">project.scrum.product.backlog</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_current':1, 'search_default_user_id':uid,'search_default_project_id':project_id}</field>
+            <field name="context">{'search_default_user_id':uid,'search_default_project_id':project_id}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
             <field name="help">The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project.</field>
         </record>
@@ -349,7 +349,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
-            <field name="context">{"search_default_current": 1}</field>
+            <field name="context">{}</field>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
             <field name="help">The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (e.g. one month) during which the team implements a list of product backlogs. The sprint review is organized when the team presents its work to the customer and product owner.</field>
         </record>
@@ -450,7 +450,7 @@
             <field name="res_model">project.scrum.meeting</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
-            <field name="context">{'search_default_scrum_daily':1,'search_default_project_id':project_id}</field>
+            <field name="context">{'search_default_project_id':project_id}</field>
             <field name="search_view_id" ref="view_scrum_meeting_search"/>
             <field name="help">The scrum agile methodology is used in software development projects. In this methodology, a daily meeting is organized by the scrum master with his team in order to detect the difficulties the team faced/will face.</field>
         </record>
diff --git a/addons/project_timesheet/project_timesheet_data.xml b/addons/project_timesheet/project_timesheet_data.xml
index 59a25c142b5..ed87cb8c65f 100644
--- a/addons/project_timesheet/project_timesheet_data.xml
+++ b/addons/project_timesheet/project_timesheet_data.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    
-        <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
+
+      <!--   <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
             <field name="name">Time Tracking</field>
             <field eval="5" name="sequence"/>
             <field name="parent_id" ref="base.menu_main_pm"/>
@@ -14,7 +14,7 @@
             <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
             <field name="icon">STOCK_JUSTIFY_FILL</field>
             <field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
-        </record>
-    
+        </record> -->
+
     </data>
 </openerp>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 7a7d4966bf2..4c357cd68b5 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -84,7 +84,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
-            <field name="context">{'search_default_to_invoice': 1}</field>
+            <field name="context">{}</field>
             <field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
             <field name="help">You will find here all works made on tasks that you can invoice.
 In order to invoice the time spent on a project, you must define the
@@ -101,18 +101,18 @@ the project form.</field>
                   parent="base.menu_main_pm" sequence="5"/>
         <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
             parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
-            
+
         <!--
             Time Tracking menu in project Management
         -->
-        <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/>
+<!--        <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/> -->
 
         <record id="action_account_analytic_overdue" model="ir.actions.act_window">
             <field name="name">Customer Projects</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}</field>
+            <field name="context">{}</field>
             <field name="domain">[('type','=','normal')]</field>
             <field name="search_view_id" ref="account_analytic_analysis.view_account_analytic_account_overdue_search"/>
             <field name="help">You will find here the contracts related to your customer projects in order to track the invoicing progress.</field>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index e24f604fbe6..b1ba9b8672e 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -3,8 +3,8 @@
  <data>
           <menuitem
             id="hr.menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
+            name="Human Resources"
+            parent="base.menu_reporting"
             sequence="40" />
 
         <!-- Report for Users' Timesheet and Task Hours per Month -->
@@ -43,7 +43,7 @@
                         <filter icon="terp-go-month"
                             string=" Month-1 "
                             domain="[('name','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task hours of last month"/>            		
+                            help="Task hours of last month"/>
 	            		<separator orientation="vertical"/>
 	                    <field name="user_id"/>
                 	</group>
@@ -58,7 +58,7 @@
             	</search>
             </field>
         </record>
-        
+
         <record id="view_task_hour_per_month_graph" model="ir.ui.view">
             <field name="name">report.timesheet.task.user.graph</field>
             <field name="model">report.timesheet.task.user</field>
@@ -71,7 +71,7 @@
                  </graph>
             </field>
         </record>
-                
+
         <record id="action_report_timesheet_task_user" model="ir.actions.act_window">
             <field name="name">Task Hours Per Month</field>
             <field name="res_model">report.timesheet.task.user</field>
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index ff1c416c07f..c0fb0b8f74d 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -50,7 +50,6 @@ Dashboard for purchase management that includes:
         'company_view.xml',
         'purchase_data.xml',
         'wizard/purchase_order_group_view.xml',
-        'wizard/purchase_installer.xml',
         'wizard/purchase_line_invoice_view.xml',
         'purchase_report.xml',
         'purchase_view.xml',
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 0bf011e5cc5..4c9e776b96b 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -4,8 +4,8 @@
 
         <menuitem
             id="menu_purchase_deshboard"
-            name="Dashboard"
-            parent="base.next_id_73" sequence="0"/>
+            name="Purchase"
+            parent="base.menu_reporting_dashboard" sequence="5"/>
 
         <record id="purchase_draft" model="ir.actions.act_window">
             <field name="name">Request for Quotations</field>
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
index b8359f3bf7f..787974646ff 100644
--- a/addons/purchase/edi/purchase_order.py
+++ b/addons/purchase/edi/purchase_order.py
@@ -65,7 +65,7 @@ class purchase_order(osv.osv, EDIMixin):
         """Exports a purchase order"""
         edi_struct = dict(edi_struct or PURCHASE_ORDER_EDI_STRUCT)
         res_company = self.pool.get('res.company')
-        res_partner_address = self.pool.get('res.partner.address')
+        res_partner_obj = self.pool.get('res.partner')
         edi_doc_list = []
         for order in records:
             # generate the main report
@@ -79,7 +79,7 @@ class purchase_order(osv.osv, EDIMixin):
                     '__import_module': 'sale',
 
                     'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context),
-                    'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_address_id], context=context)[0],
+                    'partner_address': res_partner_obj.edi_export(cr, uid, [order.partner_id], context=context)[0],
                     'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id],
                                                                          context=context)[0],
             })
@@ -95,29 +95,22 @@ class purchase_order(osv.osv, EDIMixin):
         #       the desired company among the user's allowed companies
 
         self._edi_requires_attributes(('company_id','company_address'), edi_document)
-        res_partner_address = self.pool.get('res.partner.address')
-        res_partner = self.pool.get('res.partner')
-
-        # imported company = as a new partner
-        src_company_id, src_company_name = edi_document.pop('company_id')
-        partner_id = self.edi_import_relation(cr, uid, 'res.partner', src_company_name,
-                                              src_company_id, context=context)
-        partner_value = {'customer': True}
-        res_partner.write(cr, uid, [partner_id], partner_value, context=context)
+        res_partner_obj = self.pool.get('res.partner')
 
         # imported company_address = new partner address
+        src_company_id, src_company_name = edi_document.pop('company_id')
         address_info = edi_document.pop('company_address')
-        address_info['partner_id'] = (src_company_id, src_company_name)
-        address_info['type'] = 'default'
-        address_id = res_partner_address.edi_import(cr, uid, address_info, context=context)
+        address_info['customer'] = True
+        if 'name' not in address_info:
+            address_info['name'] = src_company_name
+        address_id = res_partner_obj.edi_import(cr, uid, address_info, context=context)
 
         # modify edi_document to refer to new partner/address
-        partner_address = res_partner_address.browse(cr, uid, address_id, context=context)
-        edi_document['partner_id'] = (src_company_id, src_company_name)
+        partner_address = res_partner_obj.browse(cr, uid, address_id, context=context)
         edi_document.pop('partner_address', False) # ignored
-        edi_document['partner_address_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
+        edi_document['partner_id'] = self.edi_m2o(cr, uid, partner_address, context=context)
 
-        return partner_id
+        return address_id
 
     def _edi_get_pricelist(self, cr, uid, partner_id, currency, context=None):
         # TODO: refactor into common place for purchase/sale, e.g. into product module
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index f3f610b8e75..c4a7f75819a 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -21,8 +21,6 @@
             <field name="search_view_id" ref="email_template.view_email_template_search"/>
             <field name="context" eval="{'search_default_model_id': ref('purchase.model_purchase_order')}"/>
         </record>
-        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_purchase_config_purchase" sequence="30"/>
-        <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30"/>
     </data>
 
     <!-- Mail template and workflow bindings are done in a NOUPDATE block
@@ -38,13 +36,13 @@
             <field name="name">Automated Purchase Order Notification Mail</field>
             <field name="email_from">${object.validator.user_email or ''}</field>
             <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
-            <field name="email_to">${object.partner_address_id.email}</field>
+            <field name="email_to">${object.partner_id.email}</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
 
-    <p>Hello${object.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},</p>
+    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
     
     <p>Here is a purchase order confirmation from ${object.company_id.name}: </p>
     
@@ -107,7 +105,7 @@
 </div>
             ]]></field>
             <field name="body_text"><![CDATA[
-Hello${object.partner_address_id.name and ' ' or ''}${object.partner_address_id.name or ''},
+Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
 Here is a purchase order confirmation from ${object.company_id.name}:
        | Order number: *${object.name}*
diff --git a/addons/purchase/i18n/lv.po b/addons/purchase/i18n/lv.po
new file mode 100644
index 00000000000..bafdd0ee5b8
--- /dev/null
+++ b/addons/purchase/i18n/lv.po
@@ -0,0 +1,1883 @@
+# Latvian 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-03-20 14:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@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-03-21 05:00+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Incoming products to control"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced:0
+msgid "Invoiced & Paid"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,location_id:0 view:purchase.report:0
+#: field:purchase.report,location_id:0
+msgid "Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:236
+#, python-format
+msgid "In order to delete a purchase order, it must be cancelled first!"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.report,date:0
+msgid "Date on which this document has been created"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 view:purchase.order.line:0 view:purchase.report:0
+#: view:stock.picking:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,create_uid:0 view:purchase.report:0
+#: field:purchase.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid ""
+"You can create a request for quotation when you want to buy products to a "
+"supplier but the purchase is not confirmed yet. Use also this menu to review "
+"requests for quotation created automatically based on your logistic rules "
+"(minimum stock, MTO, etc). You can convert the request for quotation into a "
+"purchase order once the order is confirmed. If you use the extended "
+"interface (from user's preferences), you can select the way to control your "
+"supplier invoices: based on the order, based on the receptions or manual "
+"encoding."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved purchase order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 field:purchase.order,partner_id:0
+#: view:purchase.order.line:0 view:purchase.report:0
+#: field:purchase.report,partner_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
+msgid "Pricelists"
+msgstr ""
+
+#. module: purchase
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Do you want to generate the supplier invoices ?"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid ""
+"Use this menu to search within your purchase orders by references, supplier, "
+"products, etc. For each purchase order, you can track the products received, "
+"and control the supplier invoices."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_line_invoice.py:145
+#, python-format
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "From a Pick list"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:735
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_config_wizard
+msgid "purchase.config.wizard"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
+msgid "Request for Quotations"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.config.wizard,default_method:0
+msgid "Based on Receptions"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,company_id:0 field:purchase.order.line,company_id:0
+#: view:purchase.report:0 field:purchase.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
+#: view:purchase.report:0
+msgid "Monthly Purchase by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0 selection:purchase.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist,name:purchase.list0
+msgid "Default Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+
+#. module: purchase
+#: help:res.partner,property_product_pricelist_purchase:0
+msgid ""
+"This pricelist will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approve Purchase"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Based on generated draft invoice"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Order of Day"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+msgid "Monthly Purchases by Category"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase order which are in draft state"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Origin"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 field:purchase.order,notes:0
+#: view:purchase.order.line:0 field:purchase.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0 field:purchase.order,amount_tax:0
+#: view:purchase.order.line:0 field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:ir.model,name:purchase.model_purchase_order
+#: model:process.node,name:purchase.process_node_purchaseorder0
+#: field:procurement.order,purchase_id:0 view:purchase.order:0
+#: model:res.request.link,name:purchase.req_link_purchase_order
+#: field:stock.picking,purchase_id:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,name:0 view:purchase.order.line:0
+#: field:purchase.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_product
+#: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
+msgid "Products"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
+#: view:purchase.report:0
+msgid "Total Qty and Amount by month"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid ""
+"A Pick list generates an invoice. Depending on the Invoicing control of the "
+"sale order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0 selection:purchase.order.line,state:0
+#: selection:purchase.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Convert to Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0 field:purchase.report,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0 selection:purchase.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:419
+#, python-format
+msgid "You must first cancel all invoices related to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,dest_address_id:0
+msgid "Dest. Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:326
+#, python-format
+msgid "Purchase order '%s' has been set in draft state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:754 code:addons/purchase/purchase.py:769
+#: code:addons/purchase/purchase.py:772
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,validator:0 view:purchase.report:0
+msgid "Validated by"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Order in last month"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:412
+#, python-format
+msgid "You must first cancel all receptions related to this purchase order."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Net Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,shipped:0
+msgid "It indicates that a picking has been done"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase orders which are in exception state"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0 field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+#: selection:purchase.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: purchase
+#: view:stock.picking:0
+msgid "Incoming Shipments already processed"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+#: view:purchase.order.line_invoice:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
+#: selection:purchase.order,invoice_method:0
+msgid "Based on receptions"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Supplier Reference"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid ""
+"A Pick list generates a supplier invoice. Depending on the Invoicing control "
+"of the purchase order, the invoice is based on received or on ordered "
+"quantities."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid ""
+"If you set the Invoicing Control on a purchase order as \"Based on Purchase "
+"Order lines\", you can track here all the purchase order lines for which you "
+"have not yet received the supplier invoice. Once you are ready to receive a "
+"supplier invoice, you can generate a draft supplier invoice based on the "
+"lines from this menu."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase order which are in the exception state"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
+msgid ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Tel.:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_stock_picking
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Print"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
+msgid "Merge Purchase orders"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:737
+#, python-format
+msgid "No Partner!"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Fax:"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
+msgid "Create or Import Suppliers"
+msgstr ""
+
+#. module: purchase
+#: view:stock.picking:0
+msgid "Available"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,partner_address_id:0
+msgid "Address Contact Name"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+msgid "Invoices generated for a purchase order"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:285 code:addons/purchase/purchase.py:348
+#: code:addons/purchase/purchase.py:359
+#: code:addons/purchase/wizard/purchase_line_invoice.py:111
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:737
+#, python-format
+msgid ""
+"You have to select a partner in the purchase form !\n"
+"Please set one partner before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:349
+#, python-format
+msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On picking'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
+msgid ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:769
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Reference UOM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0 view:purchase.report:0
+#: field:purchase.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:236
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:285
+#, python-format
+msgid "You cannot confirm a purchase order without any lines."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid ""
+"Use this menu to control the invoices to be received from your supplier. "
+"OpenERP pregenerates draft invoices from your purchase orders or receptions, "
+"according to your settings. Once you receive a supplier invoice, you can "
+"match it with the draft invoice and validate it."
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/edi/purchase_order.py:139
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase
+msgid "Auto-email confirmed purchase orders"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approbation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0 view:purchase.order:0
+#: field:purchase.order,date_order:0 field:purchase.order.line,date_order:0
+#: field:purchase.report,date:0 view:stock.picking:0
+msgid "Order Date"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0 view:stock.picking:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0 report:purchase.quotation:0
+msgid "Qty"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_group
+msgid "Purchase Order Merge"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Order in  current month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,delay_pass:0
+msgid "Days to Deliver"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
+msgid "Receive Products"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 field:purchase.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Total Orders Lines by User per month"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved purchase orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: purchase
+#: model:email.template,subject:purchase.email_template_edi_purchase
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: model:res.groups,name:purchase.group_purchase_user
+msgid "User"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,shipped:0 field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "List of ordered products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr ""
+
+#. module: purchase
+#: view:stock.picking:0
+msgid "Is a Back Order"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0 field:purchase.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "State of the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Product Categories"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.config.wizard,default_method:0
+msgid "Pre-Generate Draft Invoices based on Purchase Orders"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
+msgid "Create invoices"
+msgstr ""
+
+#. module: purchase
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+#: view:purchase.order.line:0 field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.config.wizard,default_method:0
+msgid "Based on Purchase Order Lines"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:754
+#, python-format
+msgid "Selected UOM does not belong to the same category as the product UOM"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:907
+#, python-format
+msgid "PO: %s"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid ""
+"A purchase order generates a supplier invoice, as soon as it is confirmed by "
+"the buyer. Depending on the Invoicing control of the purchase order, the "
+"invoice is based on received or on ordered quantities."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: purchase
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr ""
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid ""
+"The invoice is created automatically if the Invoice control of the purchase "
+"order is 'On order'. The invoice can also be generated manually by the "
+"accountant (Invoice control = Manual)."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_email_templates
+#: model:ir.ui.menu,name:purchase.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "UoM Categories"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.config.wizard:0
+msgid "Invoicing Control on Purchases"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:48
+#, python-format
+msgid "Please select multiple order to merge in the list view."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer
+msgid ""
+"Create or Import Suppliers and their contacts manually from this form or you "
+"can import your existing partners by CSV spreadsheet from \"Import Data\" "
+"wizard"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Pick list generated"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Exception"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: purchase
+#: view:stock.picking:0
+msgid "Incoming Shipments Available"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
+msgid "Address Book"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
+#, python-format
+msgid "Unable to cancel this purchase order!"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "A pick list is generated to track the incoming products."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,pricelist_id:0
+msgid ""
+"The pricelist sets the currency used for this purchase order. It also "
+"computes the supplier price for the selected products/quantities."
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: purchase
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,price_standard:0
+msgid "Products Value"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
+msgid "Partner Categories"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 view:purchase.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"Based on Purchase Order lines: place individual lines in 'Invoice Control > "
+"Based on P.O. lines' from where you can selectively create an invoice.\n"
+"Based on generated invoice: create a draft invoice you can validate later.\n"
+"Based on receptions: let you create an invoice when receptions are validated."
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
+msgid "Addresses"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_rfq
+#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
+msgid "Requests for Quotation"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,delay:0
+msgid "Days to Validate"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase orders which are not approved yet."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0 view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:289
+#, python-format
+msgid "Purchase order '%s' is confirmed."
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,date_approve:0
+msgid "Date on which purchase order has been approved"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 field:purchase.order,state:0
+#: view:purchase.order.line:0 field:purchase.order.line,state:0
+#: view:purchase.report:0 view:stock.picking:0
+msgid "State"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+#: view:purchase.order:0 selection:purchase.order,state:0
+#: selection:purchase.report,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not invoiced"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0 field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 selection:purchase.order,state:0
+#: selection:purchase.order.line,state:0 selection:purchase.report,state:0
+#: view:stock.picking:0
+msgid "Done"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+msgid "Invoice"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: view:purchase.order:0 view:purchase.order.group:0
+#: view:purchase.order.line_invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 view:purchase.order.line:0
+msgid "Purchase Order Lines"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "The supplier approves the Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/wizard/purchase_order_group.py:80
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+#: view:purchase.report:0
+#, python-format
+msgid "Purchase Orders"
+msgstr ""
+
+#. module: purchase
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Merge orders"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line_invoice
+msgid "Purchase Order Line Make Invoice"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
+msgid "Total Orders by User per month"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.order,state:0 selection:purchase.report,state:0
+msgid "Request for Quotation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Tél. :"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Order of Month"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Our Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 view:purchase.order.line:0
+msgid "Search Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_config
+msgid "Set the Default Invoicing Control Method"
+msgstr ""
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Request for Quotations."
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Date Req."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,date_approve:0 field:purchase.report,date_approve:0
+msgid "Date Approved"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,state:0
+msgid "Waiting Supplier Ack"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
+msgid "Based on draft invoices"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoicing"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:772
+#, python-format
+msgid ""
+"The selected supplier has a minimal quantity set to %s %s, you should not "
+"purchase less."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,product_id:0 view:purchase.order.line:0
+#: field:purchase.order.line,product_id:0 view:purchase.report:0
+#: field:purchase.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirmation"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0 field:purchase.order.line,name:0
+#: report:purchase.quotation:0
+msgid "Description"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Order of Year"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr ""
+
+#. module: purchase
+#: view:stock.picking:0
+msgid "Journal"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
+
+#. module: purchase
+#: field:res.company,po_lead:0
+msgid "Purchase Lead Time"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
+msgid ""
+"Access your supplier records and maintain a good relationship with your "
+"suppliers. You can track all your interactions with them through the History "
+"tab: emails, orders, meetings, etc."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase orders which are in done state."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "Regards,"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0 selection:purchase.report,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,partner_address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase orders that include lines not invoiced."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: purchase
+#: view:stock.picking:0
+msgid "Picking to Invoice"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.config.wizard:0
+msgid ""
+"This tool will help you to select the method you want to use to control "
+"supplier invoices."
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
+#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
+msgid "Purchase Analysis"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.order:0
+msgid "Your Order Reference"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0 field:purchase.order,minimum_planned_date:0
+#: report:purchase.quotation:0 field:purchase.report,expected_date:0
+#: view:stock.picking:0
+msgid "Expected Date"
+msgstr ""
+
+#. module: purchase
+#: report:purchase.quotation:0
+msgid "TVA:"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
+msgid ""
+"If you set the Invoicing Control on a purchase order as \"Based on "
+"receptions\", you can track here all the product receptions and create "
+"invoices for those receptions."
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid ""
+" Please note that: \n"
+" \n"
+" Orders will only be merged if: \n"
+" * Purchase Orders are in draft \n"
+" * Purchase Orders belong to the same supplier \n"
+" * Purchase Orders are have same stock location, same pricelist \n"
+" \n"
+" Lines will only be merged if: \n"
+" * Order lines are exactly the same except for the product,quantity and unit "
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: field:purchase.report,negociation:0
+msgid "Purchase-Standard Price"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.config.wizard,default_method:0
+msgid "Default Invoicing Control Method"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,invoice_method:0
+msgid "Invoicing Control"
+msgstr ""
+
+#. module: purchase
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
+msgid "Approve"
+msgstr ""
+
+#. module: purchase
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order.line,state:0
+msgid ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:426
+#, python-format
+msgid "Purchase order '%s' is cancelled."
+msgstr ""
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
+msgid "Pricelist Versions"
+msgstr ""
+
+#. module: purchase
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:359
+#: code:addons/purchase/wizard/purchase_line_invoice.py:112
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.group:0
+msgid "Are you sure you want to merge these orders ?"
+msgstr ""
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "From a purchase order"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:735
+#, python-format
+msgid ""
+"You have to select a pricelist or a supplier in the purchase form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: purchase
+#: model:email.template,body_text:purchase.email_template_edi_purchase
+msgid ""
+"\n"
+"Hello${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''},\n"
+"\n"
+"Here is a purchase order confirmation from ${object.company_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.validator.name} "
+"${object.validator.user_email and '<%s>'%(object.validator.user_email) or "
+"''}\n"
+"\n"
+"You can view the order confirmation and download it using the following "
+"link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"Thank you!\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.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: purchase
+#: view:purchase.order:0
+msgid "Purchase orders which are in draft state"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: purchase
+#: model:res.groups,name:purchase.group_purchase_manager
+msgid "Manager"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.config.wizard:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Order in current year"
+msgstr ""
+
+#. module: purchase
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0 field:purchase.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
+#: selection:purchase.order,invoice_method:0
+msgid "Based on Purchase Order lines"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.todo.category,name:purchase.category_purchase_config
+#: model:ir.ui.menu,name:purchase.menu_procurement_management
+msgid "Purchase Management"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sale Order"
+msgstr ""
+
+#. module: purchase
+#: view:purchase.report:0
+msgid "Orders"
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,name:0
+msgid ""
+"unique number of the purchase order,computed automatically when the purchase "
+"order is created"
+msgstr ""
+
+#. module: purchase
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase.open_board_purchase
+#: model:ir.ui.menu,name:purchase.menu_board_purchase
+msgid "Purchase Dashboard"
+msgstr ""
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 3d909c1085e..79d71f2c2cc 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -49,7 +49,7 @@ class purchase_order(osv.osv):
             cur = order.pricelist_id.currency_id
             for line in order.order_line:
                val1 += line.price_subtotal
-               for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id.id, order.partner_id)['taxes']:
+               for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, line.product_id.id, order.partner_id)['taxes']:
                     val += c.get('amount', 0.0)
             res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
             res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
@@ -161,9 +161,7 @@ class purchase_order(osv.osv):
         'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
         'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
         'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
-        'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True,
-            states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},domain="[('partner_id', '=', partner_id)]"),
-        'dest_address_id':fields.many2one('res.partner.address', 'Customer Address (Direct Delivery)', domain="[('partner_id', '!=', False)]",
+        'dest_address_id':fields.many2one('res.partner', 'Customer Address (Direct Delivery)',
             states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
             help="Put an address if you want to deliver directly from the supplier to the customer." \
                 "In this case, it will remove the warehouse link and set the customer location."
@@ -215,7 +213,6 @@ class purchase_order(osv.osv):
         'shipped': 0,
         'invoice_method': 'order',
         'invoiced': 0,
-        'partner_address_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['default'])['default'],
         'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
     }
@@ -249,9 +246,9 @@ class purchase_order(osv.osv):
     def onchange_dest_address_id(self, cr, uid, ids, address_id):
         if not address_id:
             return {}
-        address = self.pool.get('res.partner.address')
+        address = self.pool.get('res.partner')
         values = {'warehouse_id': False}
-        supplier = address.browse(cr, uid, address_id).partner_id
+        supplier = address.browse(cr, uid, address_id)
         if supplier:
             location_id = supplier.property_stock_customer.id
             values.update({'location_id': location_id})
@@ -266,12 +263,12 @@ class purchase_order(osv.osv):
     def onchange_partner_id(self, cr, uid, ids, partner_id):
         partner = self.pool.get('res.partner')
         if not partner_id:
-            return {'value':{'partner_address_id': False, 'fiscal_position': False}}
+            return {'value':{'fiscal_position': False}}
         supplier_address = partner.address_get(cr, uid, [partner_id], ['default'])
         supplier = partner.browse(cr, uid, partner_id)
         pricelist = supplier.property_product_pricelist_purchase.id
         fiscal_position = supplier.property_account_position and supplier.property_account_position.id or False
-        return {'value':{'partner_address_id': supplier_address['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
+        return {'value':{'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
 
     def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
@@ -295,7 +292,7 @@ class purchase_order(osv.osv):
         return True
 
     def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
-        """Collects require data from purchase order line that is used to create invoice line 
+        """Collects require data from purchase order line that is used to create invoice line
         for that purchase order line
         :param account_id: Expense account of the product of PO line if any.
         :param browse_record order_line: Purchase order line browse record
@@ -376,10 +373,8 @@ class purchase_order(osv.osv):
                 'type': 'in_invoice',
                 'partner_id': order.partner_id.id,
                 'currency_id': order.pricelist_id.currency_id.id,
-                'address_invoice_id': order.partner_address_id.id,
-                'address_contact_id': order.partner_address_id.id,
                 'journal_id': len(journal_ids) and journal_ids[0] or False,
-                'invoice_line': [(6, 0, inv_lines)], 
+                'invoice_line': [(6, 0, inv_lines)],
                 'origin': order.name,
                 'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
                 'payment_term': order.partner_id.property_payment_term and order.partner_id.property_payment_term.id or False,
@@ -420,7 +415,7 @@ class purchase_order(osv.osv):
                 if inv:
                     wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
         self.write(cr,uid,ids,{'state':'cancel'})
-        
+
         for (id, name) in self.name_get(cr, uid, ids):
             wf_service.trg_validate(uid, 'purchase.order', id, 'purchase_cancel', cr)
             message = _("Purchase order '%s' is cancelled.") % name
@@ -433,13 +428,13 @@ class purchase_order(osv.osv):
             'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
             'date': order.date_order,
             'type': 'in',
-            'address_id': order.dest_address_id.id or order.partner_address_id.id,
+            'partner_id': order.dest_address_id.id or order.partner_id.id,
             'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'purchase_id': order.id,
             'company_id': order.company_id.id,
             'move_lines' : [],
         }
-         
+
     def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, context=None):
         return {
             'name': order.name + ': ' + (order_line.name or ''),
@@ -453,7 +448,7 @@ class purchase_order(osv.osv):
             'location_id': order.partner_id.property_stock_supplier.id,
             'location_dest_id': order.location_id.id,
             'picking_id': picking_id,
-            'address_id': order.dest_address_id.id or order.partner_address_id.id,
+            'partner_id': order.dest_address_id.id or order.partner_id.id,
             'move_dest_id': order_line.move_dest_id.id,
             'state': 'draft',
             'purchase_line_id': order_line.id,
@@ -480,7 +475,7 @@ class purchase_order(osv.osv):
                                will be added. A new picking will be created if omitted.
         :return: list of IDs of pickings used/created for the given order lines (usually just one)
         """
-        if not picking_id: 
+        if not picking_id:
             picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, context=context))
         todo_moves = []
         stock_move = self.pool.get('stock.move')
@@ -574,7 +569,6 @@ class purchase_order(osv.osv):
                     'origin': porder.origin,
                     'date_order': porder.date_order,
                     'partner_id': porder.partner_id.id,
-                    'partner_address_id': porder.partner_address_id.id,
                     'dest_address_id': porder.dest_address_id.id,
                     'warehouse_id': porder.warehouse_id.id,
                     'location_id': porder.location_id.id,
@@ -732,7 +726,7 @@ class purchase_order_line(osv.osv):
         """
         if context is None:
             context = {}
-        
+
         res = {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'notes': notes or '', 'product_uom' : uom_id or False}}
         if not product_id:
             return res
@@ -756,7 +750,7 @@ class purchase_order_line(osv.osv):
         context_partner = {'lang': lang, 'partner_id': partner_id}
         product = product_product.browse(cr, uid, product_id, context=context_partner)
         res['value'].update({'name': product.name, 'notes': notes or product.description_purchase})
-        
+
         # - set a domain on product_uom
         res['domain'] = {'product_uom': [('category_id','=',product.uom_id.category_id.id)]}
 
@@ -764,7 +758,7 @@ class purchase_order_line(osv.osv):
         product_uom_po_id = product.uom_po_id.id
         if not uom_id:
             uom_id = product_uom_po_id
-        
+
         if product.uom_id.category_id.id != product_uom.browse(cr, uid, uom_id, context=context).category_id.id:
             res['warning'] = {'title': _('Warning'), 'message': _('Selected UOM does not belong to the same category as the product UOM')}
             uom_id = product_uom_po_id
@@ -794,7 +788,7 @@ class purchase_order_line(osv.osv):
         # - determine price_unit and taxes_id
         price = product_pricelist.price_get(cr, uid, [pricelist_id],
                     product.id, qty or 1.0, partner_id, {'uom': uom_id, 'date': date_order})[pricelist_id]
-        
+
         taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id))
         fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False
         taxes_ids = account_fiscal_position.map_tax(cr, uid, fpos, taxes)
@@ -925,7 +919,6 @@ class procurement_order(osv.osv):
                 'name': name,
                 'origin': procurement.origin,
                 'partner_id': partner_id,
-                'partner_address_id': address_id,
                 'location_id': procurement.location_id.id,
                 'warehouse_id': warehouse_id and warehouse_id[0] or False,
                 'pricelist_id': pricelist_id,
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 35e9f5e15a5..4d761f2742e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -5,7 +5,7 @@
            groups="group_purchase_manager,group_purchase_user"
            web_icon="images/purchases.png"
            web_icon_hover="images/purchases-hover.png"/>
-       <menuitem id="menu_procurement_management" name="Purchase Management"
+       <menuitem id="menu_procurement_management" name="Purchase"
             parent="base.menu_purchase_root" sequence="1" />
 
         <menuitem id="menu_purchase_config_purchase" name="Configuration"
@@ -18,11 +18,11 @@
 
         <menuitem
             action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
-            parent="menu_purchase_config_pricelist" sequence="20"/>
+            parent="menu_purchase_config_pricelist" sequence="20" groups="base.group_no_one"/>
 
         <menuitem
             action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
-            parent="menu_purchase_config_pricelist" sequence="10"/>
+            parent="menu_purchase_config_pricelist" sequence="10" />
 
         <!--<menuitem
             action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type"
@@ -31,11 +31,11 @@
 
         <menuitem
             id="menu_product_in_config_purchase" name="Products"
-            parent="menu_purchase_config_purchase" sequence="30"/>
+            parent="menu_purchase_config_purchase" sequence="30" groups="base.group_no_one"/>
 
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_purchase"
-            parent="purchase.menu_product_in_config_purchase" sequence="10"/>
+            parent="purchase.menu_product_in_config_purchase" sequence="1" />
 
         <menuitem
             id="menu_purchase_unit_measure_purchase" name="Units of Measure"
@@ -43,11 +43,11 @@
 
         <menuitem
              action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
-             parent="menu_purchase_unit_measure_purchase" sequence="30"/>
+             parent="purchase.menu_product_in_config_purchase" sequence="5" />
 
         <menuitem
               action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
-              parent="menu_purchase_unit_measure_purchase" sequence="30"/>
+              parent="purchase.menu_product_in_config_purchase" sequence="10"/>
 
         <menuitem
             id="menu_purchase_partner_cat" name="Address Book"
@@ -55,38 +55,12 @@
 
         <menuitem
             action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Categories"
-            parent="purchase.menu_purchase_partner_cat"/>
-
-
-        <!--supplier addresses action-->
-        <record id="action_supplier_address_form" model="ir.actions.act_window">
-            <field name="name">Addresses</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.partner.address</field>
-            <field name="view_type">form</field>
-            <field name="context">{"search_default_supplier":1}</field>
-            <field name="search_view_id" ref="base.view_res_partner_address_filter"/>
-            <field name="help">Access your supplier records and maintain a good relationship with your suppliers. You can track all your interactions with them through the History tab: emails, orders, meetings, etc.</field>
-        </record>
-        <record id="action_supplier_address_form_view1" model="ir.actions.act_window.view">
-            <field eval="10" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="base.view_partner_address_tree"/>
-            <field name="act_window_id" ref="action_supplier_address_form"/>
-        </record>
-        <record id="action_supplier_address_form_view2" model="ir.actions.act_window.view">
-            <field eval="20" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="base.view_partner_address_form1"/>
-            <field name="act_window_id" ref="action_supplier_address_form"/>
-        </record>
+            parent="purchase.menu_purchase_partner_cat" groups="base.group_no_one"/>
 
      <!--supplier menu-->
-      <menuitem id="base.menu_procurement_management_supplier" name="Address Book"
-            parent="base.menu_purchase_root" sequence="3"/>
-      <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
-            parent="base.menu_procurement_management_supplier"
-            action="base.action_partner_supplier_form" sequence="1"/>
+    <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
+            parent="menu_procurement_management"
+            action="base.action_partner_supplier_form" sequence="15"/>
 
           <!--Inventory control-->
       <menuitem id="menu_procurement_management_inventory" name="Receive Products"
@@ -173,7 +147,6 @@
                     <notebook colspan="4">
                         <page string="Purchase Order">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"  options='{"quick_create": false}'/>
-                            <field name="partner_address_id" options='{"quick_create": false}'/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/>
                             <field name="origin" groups="base.group_extended"/>
                             <newline/>
@@ -189,8 +162,8 @@
                                 <!-- default form view -->
                             </field>
                             <group col="7" colspan="4">
-                                <field name="amount_untaxed" sum="Untaxed amount" groups="purchase.group_taxes_on_order_line,purchase.group_taxes_global_on_order"/>
-                                <field name="amount_tax" groups="purchase.group_taxes_on_order_line,purchase.group_taxes_global_on_order"/>
+                                <field name="amount_untaxed" sum="Untaxed amount"/>
+                                <field name="amount_tax"/>
                                 <field name="amount_total" sum="Total amount"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
@@ -220,9 +193,11 @@
                                 <field name="fiscal_position" widget="selection"/>
                             </group>
                             <newline/>
-                            <separator string="Purchase Control" colspan="4"/>
-                            <field name="validator"/>
-                            <field name="date_approve"/>
+                            <group colspan="2" col="2" groups="base.group_no_one">
+                                <separator string="Purchase Control" colspan="4"/>
+                                <field name="validator"/>
+                                <field name="date_approve"/>
+                            </group>
                             <separator string="Invoices" colspan="4"/>
                             <newline/>
                             <field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
@@ -366,8 +341,8 @@
                             <field name="date_planned" widget="date"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
-                            <group colspan="4" col="4" groups="purchase.group_taxes_on_order_line">
+                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
+                            <group colspan="4" col="4">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
                                     domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
@@ -429,7 +404,7 @@
                             <field name="date_planned" widget="date"  readonly="1"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index ffea456d77f..6c3250c59c6 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -166,8 +166,8 @@
             <tr>
               <td>
                 <para style="terp_default_Bold_9">Shipping address :</para>
-                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.partner_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]</para>
-                <para style="terp_default_9">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and displaye_address(o.warehouse_id.partner_address_id)) or '']]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]</para>
+                <para style="terp_default_9">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_id)) or '']]</para>
               </td>
             </tr>
           </blockTable>
@@ -182,13 +182,13 @@
         </td>
         <td>
           <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_address_id and display_address(o.partner_address_id) ]] </para>
+          <para style="terp_default_9">[[ o.partner_id and display_address(o.partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tél. : [[ (o.partner_address_id and o.partner_address_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax : [[ (o.partner_address_id and o.partner_address_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tél. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index e3a4a651b7f..99692907591 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -46,8 +46,6 @@ class purchase_report(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
         'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Supplier', readonly=True),
-        'partner_address_id':fields.many2one('res.partner.address', 'Address Contact Name', readonly=True),
-        'dest_address_id':fields.many2one('res.partner.address', 'Dest. Address Contact Name',readonly=True),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', readonly=True),
         'date_approve':fields.date('Date Approved', readonly=True),
         'expected_date':fields.date('Expected Date', readonly=True),
@@ -82,7 +80,6 @@ class purchase_report(osv.osv):
                     s.state,
                     s.date_approve,
                     date_trunc('day',s.minimum_planned_date) as expected_date,
-                    s.partner_address_id,
                     s.dest_address_id,
                     s.pricelist_id,
                     s.validator,
@@ -122,7 +119,6 @@ class purchase_report(osv.osv):
                     l.date_planned,
                     l.product_uom,
                     date_trunc('day',s.minimum_planned_date),
-                    s.partner_address_id,
                     s.pricelist_id,
                     s.validator,
                     s.dest_address_id,
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 095f17090da..0ac69172612 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -172,7 +172,7 @@
     </record>
 
 
-    <menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"
+    <menuitem id="base.next_id_73" name="Purchase" parent="base.menu_reporting" sequence="10"
         groups="purchase.group_purchase_manager"/>
     <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
 
@@ -185,7 +185,7 @@
         <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,}</field>
         <field name="help">Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries.</field>
     </record>
-    <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
+    <menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="stock.next_id_61" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index e75d062542c..2372ab4d8e4 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -91,7 +91,7 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Expected Delivery address:</para>
-          <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.partner_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
+          <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
           <para style="terp_default_9">[[ order.dest_address_id and display_address(order.dest_address_id) ]] </para>
         </td>
         <td>
@@ -100,14 +100,14 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ order.partner_address_id and display_address(order.partner_address_id) ]] </para>
+          <para style="terp_default_9">[[ (order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ display_address(order.partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tel.: [[ (order.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax: [[ (order.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA: [[ (order.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 1ef2c87cad7..9ee5e8a97de 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -37,58 +37,45 @@ class purchase_config_settings(osv.osv_memory):
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_uom':fields.boolean("Allow different UoM per product",
+        'group_uom':fields.boolean("Manage Different UoM for Products",
             implied_group='product.group_uom',
-            help="""Allows you to select and maintain different unit of measures per product."""),
-        'module_purchase_analytic_plans': fields.boolean('Purchase analytic plan',
+            help="""Allows you to select and maintain different units of measure for products."""),
+        'module_purchase_analytic_plans': fields.boolean('Purchase Analytic Plan',
             help ="""Allows the user to maintain several analysis plans. These let you split
                 lines on a purchase order between several accounts and analytic plans.
                 This installs the module purchase_analytic_plans."""),
-        'module_warning': fields.boolean("Alerts by products or supplier",
+        'module_warning': fields.boolean("Alerts by Products or Supplier",
             help="""To trigger warnings in OpenERP objects.
                 Warning messages can be displayed for objects like sale order, purchase order, picking and invoice.
                 This installs the module warning."""),
-        'module_product_manufacturer': fields.boolean("Define a manufacturer of products",
+        'module_product_manufacturer': fields.boolean("Define a Manufacturer of Products",
             help="""This allows you to define the following for a product:
                     * Manufacturer
                     * Manufacturer Product Name
                     * Manufacturer Product Code
                     * Product Attributes.
                 This installs the module product_manufacturer."""),
-        'module_purchase_double_validation': fields.boolean("Configure limit amount",
+        'module_purchase_double_validation': fields.boolean("Double Validation",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
-        'module_purchase_requisition': fields.boolean("Track the best price with Purchase Requisition",
+        'module_purchase_requisition': fields.boolean("Purchase Requisition",
             help="""When a purchase order is created, you have the opportunity to save the related requisition.
                 This object regroups and allows you to keep track and order all your purchase orders.
                 This installs the module purchase_requisition."""),
-        'tax_policy': fields.selection(
-            [('no_tax', 'No Tax'), ('global_on_order', 'Global On Order'), ('on_order_line', 'On Order Lines')],
-            'Taxes', required=True,
-            help="""Choose between either applying global taxes on a purchase order, or applying different taxes on purchase order lines, or applying no tax at all."""),
-        'group_purchase_taxes_global_on_order':fields.boolean("Global on order",
-            implied_group='purchase.group_taxes_global_on_order'),
-        'group_purchase_taxes_on_order_line':fields.boolean("On order line",
-            implied_group='purchase.group_taxes_on_order_line'),
     }
 
-    def default_get(self, cr, uid, fields, context=None):
-        res = super(purchase_config_settings, self).default_get(cr, uid, fields, context)
-        res['tax_policy'] = \
-            (res.get('group_purchase_taxes_global_on_order') and 'global_on_order') or \
-            (res.get('group_purchase_taxes_on_order_line') and 'on_order_line') or \
-            'no_tax'
-        return res
-
     _defaults = {
         'default_invoice_method': 'manual',
-        'tax_policy': 'no_tax',
     }
 
-    def onchange_tax_policy(self, cr, uid, ids, tax_policy, context=None):
-        return {'value': {
-            'group_purchase_taxes_global_on_order': tax_policy == 'global_on_order',
-            'group_purchase_taxes_on_order_line': tax_policy == 'on_order_line',
-        }}
+
+
+class account_config_settings(osv.osv_memory):
+    _inherit = 'account.config.settings'
+    _columns = {
+        'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases',
+            implied_group='purchase.group_analytic_accounting',
+            help="Allows you to specify an analytic account on purchase orders."),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 1009ac0d8d9..86fd4b636f8 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -7,27 +7,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Purchases">
-                    <group colspan="4" col="6">
-                        <separator string="Invoicing" colspan="6"/>
-                        <field name="default_invoice_method" />
-
-                        <separator string="Purchase Order" colspan="6"/>
-                        <field name="group_purchase_pricelist"/>
-                        <field name="group_purchase_taxes_global_on_order" invisible="1"/>
-                        <field name="group_purchase_taxes_on_order_line" invisible="1"/>
-                        <field name="group_uom"/>
-                        <newline/>
-                        <field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
-                        <field name="module_purchase_double_validation"/>
-                        <newline/>
-                        <field name="module_warning"/>
-                        <field name="module_purchase_requisition"/>
-                        <newline/>
-                        <field name="module_purchase_analytic_plans"/>
-
-                        <separator string="Products" colspan="6"/>
-                        <field name="module_product_manufacturer"/>
-                    </group>
+                    <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="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"/>
                 </form>
             </field>
         </record>
@@ -42,5 +39,17 @@
         <menuitem id="menu_purchase_config" name="Purchases" parent="base.menu_config"
             sequence="2" action="action_purchase_configuration"/>
 
+        <record id="view_account_config" model="ir.ui.view">
+            <field name="name">account settings</field>
+            <field name="model">account.config.settings</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="arch" type="xml">
+                <group name="analytic_accounting" position="after">
+                    <field name="group_analytic_account_for_purchases"/>
+                </group>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 0ea49a9900b..b19a62bf5d1 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -30,7 +30,6 @@ access_account_invoice_tax_purchase,account_invoice.tax purchase,account.model_a
 access_account_fiscal_position_purchase_user,account.fiscal.position purchase,account.model_account_fiscal_position,group_purchase_user,1,0,0,0

 access_account_sequence_fiscalyear_purchase_user,account.sequence.fiscalyear purchase,account.model_account_sequence_fiscalyear,group_purchase_user,1,1,1,1

 access_res_partner_purchase_user,res.partner purchase,base.model_res_partner,group_purchase_user,1,0,0,0

-access_res_partner_address_purchase_user,res.partner.address purchase,base.model_res_partner_address,group_purchase_user,1,0,0,0

 access_account_journal_period,account.journal.period,account.model_account_journal_period,group_purchase_user,1,1,1,0

 access_account_journal,account.journal,account.model_account_journal,group_purchase_user,1,0,0,0

 access_account_journal_manager,account.journal,account.model_account_journal,group_purchase_manager,1,0,0,0

diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index ba5e7fe5256..d3033a37a70 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -11,16 +11,13 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_purchase_management"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record id="group_taxes_global_on_order" model="res.groups">
-        <field name="name">Purchase Taxes Global on Order</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
-    <record id="group_taxes_on_order_line" model="res.groups">
-        <field name="name">Purchase Taxes on Order Lines</field>
+    <record id="group_analytic_accounting" model="res.groups">
+        <field name="name">Analytic Accounting for Purchases</field>
         <field name="category_id" ref="base.module_category_hidden"/>
+        <field name="implied_ids" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
     </record>
 
     <record model="ir.rule" id="purchase_order_comp_rule">
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 34579d2a7d9..35193dfa07b 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -58,8 +58,6 @@ class stock_picking(osv.osv):
         """
         invoice_vals = super(stock_picking, self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
         if picking.purchase_id:
-            invoice_vals['address_contact_id'], invoice_vals['address_invoice_id'] = \
-                self.pool.get('res.partner').address_get(cr, uid, [partner.id], ['contact', 'invoice']).values()
             invoice_vals['fiscal_position'] = picking.purchase_id.fiscal_position.id
         return invoice_vals
 
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 7afcc96767f..06d67eed281 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -78,15 +78,12 @@
                             domain="[('invoice_state', '=', '2binvoiced')]"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="partner_id"/>
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>                    
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-partner"
-                            domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State"
                             domain="[]" context="{'group_by':'state'}"/>
diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml
index abbc3047d9a..661536dd5ce 100644
--- a/addons/purchase/test/process/edi_purchase_order.yml
+++ b/addons/purchase/test/process/edi_purchase_order.yml
@@ -3,7 +3,6 @@
 -
   !record {model: purchase.order, id: purchase_order_edi_1}:
     partner_id: base.res_partner_agrolait
-    partner_address_id: base.res_partner_address_8invoice
     location_id: stock.stock_location_3
     pricelist_id: 1
     order_line:
@@ -59,7 +58,7 @@
         "partner_address": {
                 "__id": "base:724f93ec-ddd0-11e0-88ec-701a04e25543.res_partner_address_7wdsjasdjh",
                 "__module": "base",
-                "__model": "res.partner.address",
+                "__model": "res.partner",
                 "phone": "(+32).81.81.37.00", 
                 "street": "Chaussee de Namur 40", 
                 "city": "Gerompont", 
@@ -70,7 +69,7 @@
         "company_address": {
                 "__id": "base:724f93ec-ddd0-11e0-88ec-701a04e25543.main_address", 
                 "__module": "base",
-                "__model": "res.partner.address",
+                "__model": "res.partner",
                 "city": "Gerompont", 
                 "zip": "1367", 
                 "country_id": ["base:724f93ec-ddd0-11e0-88ec-701a04e25543.be", "Belgium"], 
diff --git a/addons/purchase/test/process/invoice_on_poline.yml b/addons/purchase/test/process/invoice_on_poline.yml
index c2ad07aab95..1072a28f107 100644
--- a/addons/purchase/test/process/invoice_on_poline.yml
+++ b/addons/purchase/test/process/invoice_on_poline.yml
@@ -21,7 +21,6 @@
 -
   I set the default invoicing control method "Based on Purchase Order Lines".
 -
-  !python {model: purchase.config.wizard}: |
-    new_id = self.create(cr ,uid, {'default_method': 'manual'})
+  !python {model: purchase.config.settings}: |
+    new_id = self.create(cr, uid, {'default_invoice_method': 'manual'})
     self.execute(cr, uid, [new_id])
-
diff --git a/addons/purchase/test/process/merge_order.yml b/addons/purchase/test/process/merge_order.yml
index 2ea8b7e2a31..5ba4a1a21f2 100644
--- a/addons/purchase/test/process/merge_order.yml
+++ b/addons/purchase/test/process/merge_order.yml
@@ -26,7 +26,6 @@
        
        assert total_new_qty == total_qty,"product quantities are not correspond" 
        assert order.partner_id == order3.partner_id ,"partner is not correspond"
-       assert order.partner_address_id == order3.partner_address_id ,"Partner address is not correspond"
        assert order.warehouse_id == order3.warehouse_id or order7.warehouse_id,"Warehouse is not correspond"
        assert order.state == 'draft',"New created order state should be in draft"
        assert order.pricelist_id == order3.pricelist_id,"Price list is not correspond"
diff --git a/addons/purchase/test/process/rfq2order2done.yml b/addons/purchase/test/process/rfq2order2done.yml
index 80c9e85778f..5a1e1ccde4b 100644
--- a/addons/purchase/test/process/rfq2order2done.yml
+++ b/addons/purchase/test/process/rfq2order2done.yml
@@ -40,7 +40,7 @@
     assert len(purchase_order.picking_ids) >= 1, "You should have only one reception order"
     for picking in purchase_order.picking_ids:
       assert picking.state == "assigned", "Reception state should be in assigned state"
-      assert picking.address_id.id == purchase_order.partner_address_id.id, "Delivery address of reception id is different from order"
+      assert picking.partner_id.id == purchase_order.partner_id.id, "Delivery address of reception id is different from order"
       assert picking.company_id.id == purchase_order.company_id.id, "Company is not correspond with purchase order"
 -
   Reception is ready for process so now done the reception.
diff --git a/addons/purchase/wizard/__init__.py b/addons/purchase/wizard/__init__.py
index dbc3fc5e31b..bfb4810dd5d 100644
--- a/addons/purchase/wizard/__init__.py
+++ b/addons/purchase/wizard/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import purchase_order_group
-import purchase_installer
 import purchase_line_invoice
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
deleted file mode 100644
index 484cb4a39dc..00000000000
--- a/addons/purchase/wizard/purchase_installer.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class purchase_config_wizard(osv.osv_memory):
-    _name = 'purchase.config.wizard'
-    _inherit = 'res.config'
-
-    _columns = {
-        'default_method' : fields.selection(
-            [('manual', 'Based on Purchase Order Lines'),
-             ('picking', 'Based on Receptions'),
-             ('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
-            ], 'Default Invoicing Control Method', required=True,
-        )
-    }
-    _defaults = {
-        'default_method': lambda s,c,u,ctx: s.pool.get('purchase.order').default_get(c,u,['invoice_method'],context=ctx)['invoice_method']
-    }
-
-    def execute(self, cr, uid, ids, context=None):
-        wizard = self.browse(cr, uid, ids, context=context)[0]
-        proxy = self.pool.get('ir.values')
-        proxy.set(cr, uid, 'default', False, 'invoice_method', ['purchase.order'], wizard.default_method),
-        return {'type' : 'ir.actions.act_window_close'}
-
-purchase_config_wizard()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
deleted file mode 100644
index 37ae97e9eca..00000000000
--- a/addons/purchase/wizard/purchase_installer.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="action_import_create_supplier_installer" model="ir.actions.act_window">
-            <field name="name">Create or Import Suppliers</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.partner</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_supplier': 1, 'default_supplier' : True, 'default_customer' : False}</field>
-            <field name="view_id" ref="base.view_partner_tree" />
-            <field name="help">Create or Import Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
-        </record>
-
-        <record id="category_purchase_config" model="ir.actions.todo.category">
-            <field name="name">Purchase Management</field>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="config_wizard_action_import_create_supplier_installer" model="ir.actions.todo">
-            <field name="action_id" ref="action_import_create_supplier_installer" />
-            <field name="category_id" ref="category_purchase_config" />
-        </record>
-
-        <record id="view_purchase_config" model="ir.ui.view">
-            <field name="name">Invoicing Control on Purchases</field>
-            <field name="model">purchase.config.wizard</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_view_base"/>
-            <field name="arch" type="xml">
-              <data>
-                <form position="attributes">
-                  <attribute name="string">Invoicing Control on Purchases</attribute>
-                </form>
-
-                <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
-                    <attribute name="string">Invoicing Control on Purchases</attribute>
-                </xpath>
-                <xpath expr="//label[@string='description']" position="attributes">
-                    <attribute name="string">This tool will help you to select the method you want to use to control supplier invoices.</attribute>
-                </xpath>
-                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                    <attribute name="string"/>
-                    <attribute name="rowspan">12</attribute>
-                </xpath>
-                <group string="res_config_contents" position="replace">
-                    <group colspan="4" col="4">
-                       <field name="default_method"/>
-                    </group>
-                 </group>
-              </data>
-            </field>
-        </record>
-
-
-        <record id="action_purchase_config" model="ir.actions.act_window">
-            <field name="name">Set the Default Invoicing Control Method</field>
-            <field name="res_model">purchase.config.wizard</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="view_id" ref="view_purchase_config"/>
-        </record>
-
-        <record id="todo_purchase_config" model="ir.actions.todo">
-            <field name="action_id" ref="action_purchase_config" />
-            <field name="category_id" ref="category_purchase_config" />
-            <field name="type">once</field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index 236cde7dde5..1c94ba08588 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -86,8 +86,6 @@ class purchase_line_invoice(osv.osv_memory):
                     'reference' : partner.ref,
                     'account_id': a,
                     'partner_id': partner.id,
-                    'address_invoice_id': orders[0].partner_address_id.id,
-                    'address_contact_id': orders[0].partner_address_id.id,
                     'invoice_line': [(6,0,lines_ids)],
                     'currency_id' : orders[0].pricelist_id.currency_id.id,
                     'comment': multiple_order_invoice_notes(orders),
diff --git a/addons/purchase_double_validation/i18n/pt.po b/addons/purchase_double_validation/i18n/pt.po
new file mode 100644
index 00000000000..4dd263e1652
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/pt.po
@@ -0,0 +1,70 @@
+# 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:37+0000\n"
+"PO-Revision-Date: 2012-03-29 11:26+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-03-30 04:34+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr ""
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 705570c4577..9bf03474e86 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -24,8 +24,8 @@ from osv import fields, osv
 class purchase_config_settings(osv.osv_memory):
     _inherit = 'purchase.config.settings'
     _columns = {
-        'limit_amount': fields.integer('Maximum Purchase Amount',required=True,
-            help="Maximum amount after which validation of purchase is required."),
+        'limit_amount': fields.integer('Double Validation Limit',required=True,
+            help="Amount after which validation of purchase is required."),
     }
 
     _defaults = {
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 302dbaa6c4f..582312bfd6f 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -7,8 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_purchase_double_validation" position="after">
-                    <field name="limit_amount" nolabel="1"/>
+                <field name="module_purchase_double_validation" position="replace">
+                    <field name="limit_amount"/>
                 </field>
             </field>
         </record>
diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
index b4005133b60..61503564246 100644
--- a/addons/purchase_double_validation/purchase_double_validation_workflow.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -3,7 +3,7 @@
     <data>
 
          <record id="purchase.trans_confirmed_router" model="workflow.transition">
-            <field name="condition">amount_untaxed &gt;= 1000</field>
+            <field name="condition">amount_untaxed &gt;= 5000</field>
             <field name="signal">purchase_approve</field>
             <field name="group_id" ref="purchase.group_purchase_manager"/>
         </record>
@@ -11,7 +11,7 @@
         <record id="trans_waiting_confirmed" model="workflow.transition">
             <field name="act_from" ref="purchase.act_confirmed"/>
             <field name="act_to" ref="purchase.act_router"/>
-            <field name="condition">amount_untaxed &lt; 1000</field>
+            <field name="condition">amount_untaxed &lt; 5000</field>
         </record>
 
     </data>
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index c43bd524090..43cfe2de069 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -128,7 +128,6 @@ class purchase_requisition(osv.osv):
         res_partner = self.pool.get('res.partner')
         fiscal_position = self.pool.get('account.fiscal.position')
         supplier = res_partner.browse(cr, uid, partner_id, context=context)
-        delivery_address_id = res_partner.address_get(cr, uid, [supplier.id], ['delivery'])['delivery']
         supplier_pricelist = supplier.property_product_pricelist_purchase or False
         res = {}
         for requisition in self.browse(cr, uid, ids, context=context):
@@ -138,7 +137,6 @@ class purchase_requisition(osv.osv):
             purchase_id = purchase_order.create(cr, uid, {
                         'origin': requisition.name,
                         'partner_id': supplier.id,
-                        'partner_address_id': delivery_address_id,
                         'pricelist_id': supplier_pricelist.id,
                         'location_id': location_id,
                         'company_id': requisition.company_id.id,
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index 9ef7bc40d97..41491cc64ca 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -32,7 +32,6 @@
             <field name="location_id" ref="stock.stock_location_stock"/>
             <field name="pricelist_id" ref="purchase.list0"/>
             <field name="partner_id" ref="base.res_partner_4"/>
-            <field name="partner_address_id" ref="base.res_partner_address_7"/>
             <field name="requisition_id" ref="requisition1"/>
         </record>
 
@@ -50,7 +49,6 @@
             <field name="location_id" ref="stock.stock_location_stock"/>
             <field name="pricelist_id" ref="purchase.list0"/>
             <field name="partner_id" ref="base.res_partner_vickingdirect0"/>
-            <field name="partner_address_id" ref="base.res_partner_address_brussels0"/>
             <field name="requisition_id" ref="requisition1"/>
         </record>
 
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index bd47d093df0..d6a736eea9c 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -166,7 +166,7 @@
         <field name="res_model">purchase.requisition</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="context">{"search_default_create_uid":uid,'search_default_draft': 1}</field>
+        <field name="context">{"search_default_create_uid":uid}</field>
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
         <field name="help">A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others.</field>
     </record>
diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml
index 56e4c1ae0af..f33f25536af 100644
--- a/addons/purchase_requisition/report/purchase_requisition.rml
+++ b/addons/purchase_requisition/report/purchase_requisition.rml
@@ -223,7 +223,7 @@
       <blockTable colWidths="338.0,96.0,96.0" style="Table7">
         <tr>
           <td>
-            <para style="terp_default_9">[[ (purchase_ids.partner_address_id and purchase_ids.partner_address_id.partner_id and purchase_ids.partner_address_id.partner_id.name) or '' ]]</para>
+            <para style="terp_default_9">[[ (purchase_ids.partner_id and purchase_ids.partner_id.name) or '' ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ formatLang(purchase_ids.date_order,date='True') ]]</para>
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index 71c54b973e3..12f9a9e56b8 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -17,6 +17,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="module_category_purchase_requisition"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_requisition_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     
     <record model="ir.rule" id="purchase_requisition_comp_rule">
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 043ed749f4b..a6b806471ef 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -29,7 +29,6 @@ class purchase_requisition_partner(osv.osv_memory):
     _description = "Purchase Requisition Partner"
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
-        'partner_address_id':fields.many2one('res.partner.address', 'Address'),
     }
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -42,13 +41,6 @@ class purchase_requisition_partner(osv.osv_memory):
             raise osv.except_osv(_('Error!'), _('No Product in Tender'))
         return res
 
-    def onchange_partner_id(self, cr, uid, ids, partner_id):
-        if not partner_id:
-            return {}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['default'])
-        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
-        return {'value':{'partner_address_id': addr['default']}}
-
     def create_order(self, cr, uid, ids, context=None):
         active_ids = context and context.get('active_ids', [])
         data =  self.browse(cr, uid, ids, context=context)[0]
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index d994ba71405..4656d3c37c6 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -8,8 +8,7 @@
             <field name="arch" type="xml">
               	<form string="Purchase Requisition">
               	 <group colspan="2" col="2">
-              		 <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-              		 <field domain="[('partner_id','=',partner_id)]" name="partner_address_id"/>
+              	     <field name="partner_id"/>
               		  <separator string="" colspan="4" />
 		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/>
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index 497fa6b44ba..c07bd06f402 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -141,14 +141,14 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_8">[[ o.address_invoice_id and display_address(o.address_invoice_id) ]] </para>
+          <para style="terp_default_8">[[ (o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_8">[[ o.partner_id and display_address(o.partner_id) ]] </para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -184,7 +184,7 @@
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
+          <para style="terp_default_Centre_9">[[ (o.partner_id.ref) or ' ' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -398,4 +398,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index ffe90b54d4f..5a0c31bbdcc 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -112,10 +112,9 @@ class report_intrastat(osv.osv):
                     left join product_uom uom on uom.id=inv_line.uos_id
                     left join product_uom puom on puom.id = pt.uom_id
                     left join report_intrastat_code intrastat on pt.intrastat_id = intrastat.id
-                    left join (res_partner_address inv_address
+                    left join (res_partner inv_address
                         left join res_country inv_country on (inv_country.id = inv_address.country_id))
-                    on (inv_address.id = inv.address_invoice_id)
-
+                    on (inv_address.id = inv.partner_id)
                 where
                     inv.state in ('open','paid')
                     and inv_line.product_id is not null
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index b14b94ef315..2527f2e4f97 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -68,7 +68,7 @@
         </record>
 
         <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" 
-                parent="base.menu_config_address_book" sequence="2"/>
+                parent="base.menu_config_address_book" sequence="2" groups="base.group_no_one"/>
 
 
         <record id="view_report_intrastat_tree" model="ir.ui.view">
diff --git a/addons/report_intrastat/test/report_intrastat_report.yml b/addons/report_intrastat/test/report_intrastat_report.yml
index 2c85007e70c..e049c0ffcb8 100644
--- a/addons/report_intrastat/test/report_intrastat_report.yml
+++ b/addons/report_intrastat/test/report_intrastat_report.yml
@@ -4,13 +4,11 @@
   !record {model: account.invoice, id: test_invoice_1}:
     currency_id: base.EUR
     company_id: base.main_company
-    address_invoice_id: base.res_partner_address_tang
     partner_id: base.res_partner_asus
     state: draft
     type: out_invoice
     account_id: account.a_recv
     name: Test invoice 1
-    address_contact_id: base.res_partner_address_tang
 -
   In order to test the PDF reports defined using report_intrastat module, we print a Intrastat Report
 -
diff --git a/addons/report_webkit/data.xml b/addons/report_webkit/data.xml
index 6cc254b1451..fb58c9fb1ac 100644
--- a/addons/report_webkit/data.xml
+++ b/addons/report_webkit/data.xml
@@ -67,15 +67,15 @@
                 <td/>
             </tr>
             <tr>
-                <td >${company.partner_id.address and company.partner_id.address[0].street or ''|entity}</td>
+                <td >${company.partner_id.street or ''|entity}</td>
                 <td/>
             </tr>
             <tr>
-                <td>Phone: ${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} </td>
+                <td>Phone: ${company.partner_id.phone or ''|entity} </td>
                 <td/>
             </tr>
             <tr>
-                <td>Mail: ${company.partner_id.address and company.partner_id.address[0].email or ''|entity}<br/></td>
+                <td>Mail: ${company.partner_id.email or ''|entity}<br/></td>
             </tr>
         </table> ${_debug or ''|n} </body>
 </html>]]>
diff --git a/addons/resource/i18n/sl.po b/addons/resource/i18n/sl.po
new file mode 100644
index 00000000000..8dae289b856
--- /dev/null
+++ b/addons/resource/i18n/sl.po
@@ -0,0 +1,351 @@
+# Slovenian 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:37+0000\n"
+"PO-Revision-Date: 2012-03-21 14:09+0000\n"
+"Last-Translator: Matjaz Kalic <matjaz@mentis.si>\n"
+"Language-Team: Slovenian <sl@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-03-22 04:57+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: field:resource.resource,calendar_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/resource.py:392
+#, python-format
+msgid "Make sure the Working time has been configured with proper week days!"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr ""
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr ""
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr ""
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr ""
+
+#. module: resource
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Working Period"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_calendar_form
+msgid ""
+"Define working hours and time table that could be scheduled to your project "
+"members"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Starting Date of Leave"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+msgid "Working time"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allow you to create and manage resources that should be involved "
+"in a specific project phase. You can also set their efficiency level and "
+"workload based on their weekly working hours."
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:340
+#, python-format
+msgid "(vacation)"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/resource.py:392
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/resource.py:310
+#, python-format
+msgid " (copy)"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Sobota"
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index e1b3c57de00..8a2686cca83 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -66,7 +66,7 @@ Dashboard for Sales Manager that includes:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/deliveries_to_invoice.jpeg','images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
-    'depends': ['stock', 'procurement', 'board'],
+    'depends': ['stock', 'procurement', 'board', 'account_voucher'],
     'init_xml': [],
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 1e8600232bc..8a6caf1a849 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -30,8 +30,8 @@
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
 
-        <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
-        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
+        <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
+        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_sales_dashboard" sequence="0" groups="base.group_sale_manager"/>
 
 
     <record id="action_quotation_for_sale" model="ir.actions.act_window">
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index d40d0b613ed..180b0e6f9a6 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -68,7 +68,7 @@ class sale_order(osv.osv, EDIMixin):
         """Exports a Sale order"""
         edi_struct = dict(edi_struct or SALE_ORDER_EDI_STRUCT)
         res_company = self.pool.get('res.company')
-        res_partner_address = self.pool.get('res.partner.address')
+        res_partner_obj = self.pool.get('res.partner')
         edi_doc_list = []
         for order in records:
             # generate the main report
@@ -82,7 +82,7 @@ class sale_order(osv.osv, EDIMixin):
                     '__import_module': 'purchase',
 
                     'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context),
-                    'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_order_id], context=context)[0],
+                    'partner_address': res_partner_obj.edi_export(cr, uid, [order.partner_id], context=context)[0],
 
                     'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id],
                                                                          context=context)[0],
@@ -99,32 +99,27 @@ class sale_order(osv.osv, EDIMixin):
         #       the desired company among the user's allowed companies
 
         self._edi_requires_attributes(('company_id','company_address'), edi_document)
-        res_partner_address = self.pool.get('res.partner.address')
-        res_partner = self.pool.get('res.partner')
+        res_partner_obj = self.pool.get('res.partner')
 
-        # imported company = as a new partner
+        # imported company_address = new partner address
         src_company_id, src_company_name = edi_document.pop('company_id')
-        partner_id = self.edi_import_relation(cr, uid, 'res.partner', src_company_name,
-                                              src_company_id, context=context)
-        partner_value = {'supplier': True}
-        res_partner.write(cr, uid, [partner_id], partner_value, context=context)
 
-        # imported company_address = new partner address
         address_info = edi_document.pop('company_address')
-        address_info['partner_id'] = (src_company_id, src_company_name)
-        address_info['type'] = 'default'
-        address_id = res_partner_address.edi_import(cr, uid, address_info, context=context)
+        address_info['supplier'] = True
+        if 'name' not in address_info:
+            address_info['name'] = src_company_name
+
+        address_id = res_partner_obj.edi_import(cr, uid, address_info, context=context)
 
         # modify edi_document to refer to new partner/address
-        partner_address = res_partner_address.browse(cr, uid, address_id, context=context)
-        edi_document['partner_id'] = (src_company_id, src_company_name)
+        partner_address = res_partner_obj.browse(cr, uid, address_id, context=context)
         edi_document.pop('partner_address', False) # ignored
         address_edi_m2o = self.edi_m2o(cr, uid, partner_address, context=context)
-        edi_document['partner_order_id'] = address_edi_m2o
+        edi_document['partner_id'] = address_edi_m2o
         edi_document['partner_invoice_id'] = address_edi_m2o
         edi_document['partner_shipping_id'] = address_edi_m2o
 
-        return partner_id
+        return address_id
 
     def _edi_get_pricelist(self, cr, uid, partner_id, currency, context=None):
         # TODO: refactor into common place for purchase/sale, e.g. into product module
@@ -212,11 +207,11 @@ class sale_order_line(osv.osv, EDIMixin):
                                product_qty=line.product_uos_qty)
 
             # company.security_days is for internal use, so customer should only
-            # see the expected date_planned based on line.delay 
+            # see the expected date_planned based on line.delay
             date_planned = datetime.strptime(line.order_id.date_order, DEFAULT_SERVER_DATE_FORMAT) + \
                             relativedelta(days=line.delay or 0.0)
             edi_doc['date_planned'] = date_planned.strftime(DEFAULT_SERVER_DATE_FORMAT)
             edi_doc_list.append(edi_doc)
         return edi_doc_list
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 3d7a554ff4a..9fcee173014 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -21,8 +21,7 @@
             <field name="search_view_id" ref="email_template.view_email_template_search"/>
             <field name="context" eval="{'search_default_model_id': ref('sale.model_sale_order')}"/>
         </record>
-        <menuitem id="menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="30"/>
-        <menuitem id="menu_email_templates" parent="menu_sales_configuration_misc" action="action_email_templates" sequence="30"/>
+        <menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="75"/>
     </data>
 
 
@@ -46,10 +45,10 @@
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
 
-    <p>Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name or ''},</p>
+    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
     
     <p>Here is your order confirmation for ${object.partner_id.name}: </p>
-    
+
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />
        &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />
@@ -67,7 +66,7 @@
     <p>
     You can view the order confirmation document, download it and pay online using the following link:
     </p>
-            <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;" 
+            <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;"
                href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
 
     % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account:
@@ -128,7 +127,7 @@
 </div>
             ]]></field>
             <field name="body_text"><![CDATA[
-Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name or ''},
+Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
 
 Here is your order confirmation for ${object.partner_id.name}:
        | Order number: *${object.name}*
@@ -146,7 +145,7 @@ You can view the order confirmation, download it and even pay online using the f
     ${ctx.get('edi_web_url_view') or 'n/a'}
 
 % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account:
-<% 
+<%
 comp_name = quote(object.company_id.name)
 order_name = quote(object.name)
 paypal_account = quote(object.company_id.paypal_account)
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index dbffb3f7ade..60691892501 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/i18n/nl_BE.po
@@ -1,145 +1,214 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* sale
+# Dutch (Belgium) 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: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:34:15+0000\n"
-"PO-Revision-Date: 2009-08-28 15:34:15+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"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-03-20 15:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-21 05:00+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
 
 #. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Recreate Procurement"
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
+#: view:sale.order:0
+msgid "UoS"
 msgstr ""
 
 #. module: sale
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-msgid "Waiting Schedule"
+#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
+msgid "Quantity"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: view:sale.report:0 field:sale.report,day:0
+msgid "Day"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sale Order"
+#: code:addons/sale/sale.py:638
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0 rml:sale.order:0
-msgid "Quantity"
+#: view:sale.order:0
+msgid "Print Quotation"
 msgstr ""
 
 #. module: sale
-#: wizard_view:sale.advance_payment_inv,create:0
-msgid "You invoice has been successfully created !"
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Automatic Declaration"
+#: report:sale.order:0
+msgid "VAT"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
+#: view:sale.report:0 field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-msgid "Invoice Exception"
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: code:addons/sale/sale.py:295
+#, python-format
 msgid ""
-"This is a list of picking that has been generated for this sale order"
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Delivery, from the warehouse to the customer."
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
+#: view:sale.report:0 field:sale.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Make Invoice"
+msgid "Order Line"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
+#: help:sale.order,invoice_quantity:0
 msgid ""
-"Whenever confirm button is clicked, the draft state is moved to manual. that "
-"is, quotation is moved to  sale order."
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
-msgid "Cancel Order"
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
 msgstr ""
 
 #. module: sale
@@ -148,975 +217,1314 @@ msgid "Inventory Moves"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Manual Designation"
+#: field:sale.order,name:0 field:sale.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
+#: view:sale.order:0
+msgid "Other Information"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-msgid "Invoice after delivery"
+#: view:sale.order:0
+msgid "Dates"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_tax:0 field:sale.order.line,tax_id:0
-msgid "Taxes"
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Net Total :"
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-msgid "Cancelled"
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-msgid "Shipping Exception"
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_total:0
-msgid "Total"
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,origin:0
-msgid "Origin"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Outgoing Products"
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Reference"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
+#: field:sale.shop,name:0
+msgid "Shop Name"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid "Procurement is created after confirmation of sale order."
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+"  - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,project_id:0 field:sale.shop,project_id:0
-msgid "Analytic Account"
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid "No Customer Defined !"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "TVA :"
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,type:0
-msgid "Procure Method"
+#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Extra Info"
+msgid "Conditions"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Fax :"
+#: code:addons/sale/sale.py:1034
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,price_net:0
-msgid "Net Price"
+#: selection:sale.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree9
-#: model:ir.ui.menu,name:sale.menu_action_order_tree9
-msgid "My sales order in progress"
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "invalid mode for test_state"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you invoice based on ordered or shipped quantities. If the product "
-"is a service, shipped quantities means hours spent on the associated tasks."
+#: selection:sale.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
+#: code:addons/sale/sale.py:617
+#, python-format
+msgid "Could not cancel this sales order !"
 msgstr ""
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree_all
-#: model:ir.ui.menu,name:sale.menu_action_order_tree_all
-msgid "All Sales Order"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
+#: selection:sale.report,month:0
+msgid "October"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
+#: view:board.board:0 view:sale.order:0 view:sale.report:0
+msgid "Quotations"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sale Shop"
+#: report:sale.order:0
+msgid "TVA :"
 msgstr ""
 
 #. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Order N°"
+#: report:sale.order:0
+msgid "Quotation Date"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,order_line:0 view:sale.order.line:0
-msgid "Order Lines"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Disc.(%)"
+#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
+msgid "UoM"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "In Progress"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
+#: code:addons/sale/sale.py:1074
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1079
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1147
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
 msgid ""
-"Packing list is created when 'Assign' is being clicked after confirming the "
-"sale order. This transaction moves the sale order to packing list."
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree8
-#: model:ir.ui.menu,name:sale.menu_action_order_tree8
-msgid "My sales order waiting Invoice"
+#: report:sale.order:0
+msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Shipping address :"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
 msgid ""
-"When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
-"will automatic create after delivery."
+"You cannot group sales having different currencies for the same partner."
 msgstr ""
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
+msgid "Deliver each product when available"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Manual Description"
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+msgid "Invoiced"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree1
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
 #: view:sale.order.line:0
-msgid "Sales Order Lines"
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sale Order Procurement"
+#: view:sale.report:0 field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Packing"
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Total :"
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,name:0
-msgid "Order Reference"
+#: report:sale.order:0
+msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0
-msgid "Done"
+#: field:sale.order,order_line:0
+msgid "Order Lines"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.shop,pricelist_id:0
-msgid "Pricelist"
+#: view:sale.order:0
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.menu_shop_configuration
-msgid "Configuration"
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on Order After Delivery"
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
 msgstr ""
 
 #. module: sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: field:sale.order,create_date:0
+msgid "Creation Date"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Packing"
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
 msgstr ""
 
 #. module: sale
-#: field:sale.shop,payment_account_id:0
-msgid "Payment Accounts"
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
 msgstr ""
 
 #. module: sale
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
+#: report:sale.order:0
+msgid "Total :"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Ref"
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Invalid action !"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales orders"
+msgid "Extra Info"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
+#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Payment accounts"
+#: view:sale.report:0 field:sale.report,product_uom_qty:0
+msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,create,end:0
-msgid "Close"
+#: code:addons/sale/sale.py:1327
+#, python-format
+msgid "Hour"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Draft Invoice"
+#: view:sale.order:0
+msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.order.line.make_invoice,init,grouped:0
-#: wizard_field:sale.order.make_invoice,init,grouped:0
-msgid "Group the invoices"
+#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
 msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
-#: model:ir.ui.menu,name:sale.menu_action_order_tree5
 msgid "All Quotations"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
+#: view:sale.config.picking_policy:0
+msgid "Options"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "Draft customer invoice, to be reviewed by accountant."
+#: selection:sale.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree3
-#: model:ir.ui.menu,name:sale.menu_action_order_tree3
-msgid "Sales Order To Be Invoiced"
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Procurement for each line"
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree10
-#: model:ir.ui.menu,name:sale.menu_action_order_tree10
-msgid "My Quotations"
+#: view:sale.report:0 field:sale.report,categ_id:0
+msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: wizard_view:sale.advance_payment_inv,create:0
-msgid "Invoices"
+#: report:sale.order:0
+msgid "Taxes :"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
+msgid "Stock Moves"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Packing Default Policy"
+#: field:sale.order,state:0 field:sale.report,state:0
+msgid "Order State"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Manages the delivery and invoicing progress"
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
+#: view:sale.report:0
+msgid "Sales By Month"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
+#: code:addons/sale/sale.py:1078
+#, python-format
+msgid "Could not cancel sales order line!"
 msgstr ""
 
 #. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-#: model:ir.ui.menu,name:sale.menu_sale_root
-msgid "Sales Management"
+#: field:res.company,security_lead:0
+msgid "Security Days"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,order_id:0
-msgid "Order Ref"
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Recreate Invoice"
+msgid "Create Final Invoice"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,user_id:0
-msgid "Salesman"
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.order,shipped:0
 msgid ""
-"In sale order , procuerement for each line and it comes into the procurement "
-"order"
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Taxes :"
+#: field:sale.order,date_order:0
+msgid "Date"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
+#: view:sale.report:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.wizard,name:sale.advance_payment
-msgid "Advance Invoice"
+#: selection:sale.order.line,state:0
+msgid "Exception"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,state:0
-msgid "Order State"
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
-msgid "Uninvoiced Lines"
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1272
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"This Configuration step use to set default picking policy when make sale "
-"order"
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-msgid "Sales Process"
+#: report:sale.order:0
+msgid "Your Reference"
 msgstr ""
 
 #. module: sale
-#: wizard_view:sale.order.line.make_invoice,init:0
-#: wizard_button:sale.order.line.make_invoice,init,invoice:0
-#: wizard_view:sale.order.make_invoice,init:0
-#: wizard_button:sale.order.make_invoice,init,invoice:0
-msgid "Create invoices"
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
 msgstr ""
 
 #. module: sale
-#: constraint:product.template:0
+#: help:res.company,security_lead:0
 msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
+"This is the days added to what you promise to customers for security purpose"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree7
-#: model:ir.ui.menu,name:sale.menu_action_order_tree7
-msgid "My sales in shipping exception"
+#: view:sale.order.line:0
+msgid "Qty"
 msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Sales Configuration"
+#: view:sale.order:0
+msgid "References"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-#: model:ir.ui.menu,name:sale.menu_action_order_tree2
-msgid "Sales in Exception"
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
+#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+msgid "Cancel"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0 view:sale.order.line:0
+msgid "Create Invoice"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Procurement Corrected"
+msgid "Total Tax Excluded"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Sale Procurement"
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
 msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sale Order Logistics"
+#: view:sale.report:0
+msgid "Sales by Partner"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,state:0
-msgid "Status"
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Packing Policy"
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Our Salesman"
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
 msgstr ""
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,init,create:0
-msgid "Create Advance Invoice"
+#: selection:sale.order.line,type:0
+msgid "on order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid "One procurement for each product."
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sales Orders"
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
 msgstr ""
 
 #. module: sale
-#: field:product.product,pricelist_sale:0
-msgid "Sale Pricelists"
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-#: field:sale.order.line,property_ids:0
-msgid "Properties"
+#: report:sale.order:0
+msgid "Shipping address :"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
-msgid "Quotation"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
 msgstr ""
 
 #. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance Product"
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"Invoice is created when 'Create Invoice' is being clicked after confirming "
-"the sale order. This transaction moves the sale order to invoices."
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Compute"
+msgid "Qty(UoS)"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
-msgid "Shop"
+#: view:sale.order:0
+msgid "Total Tax Included"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "VAT"
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-#: model:ir.ui.menu,name:sale.menu_action_order_tree4
-msgid "Sales Order in Progress"
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
+#: view:sale.report:0
+msgid "Sales by Product Category"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "History"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the packing order after the payment of this invoice.\n"
-"  - The 'Shipping & Manual Invoice' will create the packing order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-"  - The 'Invoice on Order After Delivery' choice will generate the draft "
-"invoice based on sale order after all packing lists have been finished.\n"
-"  - The 'Invoice from the packing' choice is used to create an invoice "
-"during the packing process."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Your Reference"
+#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
+#: view:sale.order:0
+msgid "Recreate Invoice"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales order lines"
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Waiting Schedule"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Sales"
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Qty"
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
 msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
-msgid "Packing OUT is created for stockable products."
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_text:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Your reference: ${object.client_order_ref}<br />\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 order confirmation, download it and even pay online using "
+"the following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\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: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Other data"
+msgid "Confirm Order"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0 rml:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
+#: view:sale.order:0 field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Invoice address :"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: field:sale.order,invoice_ids:0
-msgid "Invoice"
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: wizard_button:sale.advance_payment_inv,init,end:0
-#: view:sale.config.picking_policy:0 view:sale.order.line:0
-#: wizard_button:sale.order.line.make_invoice,init,end:0
-#: wizard_button:sale.order.make_invoice,init,end:0
-msgid "Cancel"
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sale order. The exception state is "
-"automatically set when a cancel operation occurs in the invoice validation "
-"(Invoice Exception) or in the packing list process (Shipping Exception). The "
-"'Waiting Schedule' state is set when the invoice is confirmed but waiting "
-"for the scheduler to run on the date 'Date Ordered'."
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "UoM"
+#: view:sale.report:0
+msgid "Sales order created in current month"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
+#: report:sale.order:0
+msgid "Fax :"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
+#: help:sale.order.line,type:0
 msgid ""
-"Confirming the packing list moves them to delivery order. This can be done "
-"by clicking on 'Validate' button."
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-msgid "In Progress"
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
-#: wizard_view:sale.advance_payment_inv,init:0
-msgid "Advance Payment"
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
 msgstr ""
 
 #. module: sale
-#: constraint:ir.model:0
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid "Confirm sale order and Create invoice."
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Packing List & Delivery Order"
+#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
+#: code:addons/sale/sale.py:1033
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "Could not cancel sales order !"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sale Order Lines"
+msgid "Qty(UoM)"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.order:0
-msgid "Create Invoice"
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: wizard_view:sale.order.line.make_invoice,init:0
-#: wizard_view:sale.order.make_invoice,init:0
-msgid "Do you really want to create the invoices ?"
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Invoice based on packing lists"
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1156
+#, python-format
+msgid "Picking Information ! : "
 msgstr ""
 
 #. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
 #: view:sale.config.picking_policy:0
-msgid "Set Default"
+msgid "Setup your Invoicing Method"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Sales order"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Quotation (A sale order in draft state)"
+#: view:sale.report:0
+msgid "Reference UoM"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "Sale Invoice"
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,product_id:0
-#: field:sale.order.line,product_id:0
-msgid "Product"
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Invoice Exception"
 msgstr ""
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,create,open:0
-msgid "Open Advance Invoice"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
+#: field:sale.order,invoiced:0
+msgid "Paid"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Price"
+#: code:addons/sale/sale.py:1151
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Deliver"
+#: view:sale.order:0
+msgid "Recreate Packing"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
+#: view:sale.order:0 field:sale.order.line,property_ids:0
+msgid "Properties"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Tel. :"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Quotation N°"
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: field:stock.move,sale_line_id:0
-msgid "Sale Order Line"
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice from the Packing"
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0 view:sale.report:0
+msgid "Sales"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
-#: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
-msgid "Make invoices"
+#: report:sale.order:0 field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
+#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order.line,state:0 selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
 msgid ""
-"The name and address of the contact that requested the order or quotation."
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_id:0 field:sale.order.line,order_partner_id:0
-msgid "Customer"
+#: field:sale.order,origin:0
+msgid "Source Document"
 msgstr ""
 
 #. module: sale
-#: field:product.product,pricelist_purchase:0
-msgid "Purchase Pricelists"
+#: view:sale.order.line:0
+msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sale Order"
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree_new
-#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
-msgid "New Quotation"
+#: code:addons/sale/sale.py:604
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Total amount"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0 field:sale.order.line,product_id:0
+#: view:sale.report:0 field:sale.report,product_id:0
+msgid "Product"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0 field:sale.order,date_order:0
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0 view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Date Ordered"
 msgstr ""
 
@@ -1126,7 +1534,7 @@ msgid "Product UoS"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
+#: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr ""
 
@@ -1136,70 +1544,289 @@ msgid "Product UoM"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, Open ERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: view:sale.order:0
+msgid "Logistic"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sale Order"
+#: view:sale.order.line:0
+msgid "Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_order0
-msgid "Order"
+#: code:addons/sale/sale.py:1017
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Payment Terms"
+#: view:sale.order:0
+msgid "Ignore Exception"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Invoice Corrected"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Delay"
+#: code:addons/sale/sale.py:1251
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Related invoices"
+msgid "States"
 msgstr ""
 
 #. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0 view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 view:sale.order.line:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
 msgstr ""
 
 #. module: sale
 #: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
+msgid "Pay before delivery"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_ids:0
+#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
+#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1269
+#, python-format
 msgid ""
-"This is the list of invoices that have been generated for this sale order. "
-"The same sale order may have been invoiced in several times (by line for "
-"example)."
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0
+#: view:sale.report:0 field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid "Warning"
 msgstr ""
 
 #. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0 view:sale.order.line:0
-msgid "States"
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current year"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
 msgstr ""
 
 #. module: sale
@@ -1208,282 +1835,329 @@ msgid "Weight"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "After confirming order, Create the invoice."
+#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
 #. module: sale
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
+#: selection:sale.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 field:sale.order,shipped:0
-msgid "Picked"
+#: field:sale.config.picking_policy,config_logo:0
+msgid "Image"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
+#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
+#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
+#: view:sale.report:0 field:sale.report,user_id:0
+msgid "Salesman"
 msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
-#: model:ir.ui.menu,name:sale.menu_action_order_tree
-msgid "My Sales Order"
+msgid "Old Quotations"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sale Order line"
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
 msgstr ""
 
 #. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Dashboard for sales"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0 view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sale Dashboard"
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "The sales order '%s' has been cancelled."
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-msgid "Sales of the month"
+#: selection:sale.order.line,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-msgid "Sales manager board"
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-msgid "Cases of the month"
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-msgid "My open quotations"
+#: view:sale.order:0
+msgid "Packings"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-msgid "Cases statistics"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-msgid "Top ten sales of the month"
+#: view:sale.report:0
+msgid "Sales order created in last month"
 msgstr ""
 
 #. module: sale
-#: field:report.sale.order.category,price_average:0
-#: field:report.sale.order.product,price_average:0
-msgid "Average Price"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_created
-msgid "Report of Created Sale Order"
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+msgid "Sales Orders"
 msgstr ""
 
 #. module: sale
-#: view:report.sale.order.category:0
-msgid "Sales Orders by category"
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+msgid "Sales Shop"
 msgstr ""
 
 #. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_6
-#: model:ir.report.custom,title:sale.ir_report_custom_6
-msgid "Monthly cumulated sales turnover over one year"
+#: selection:sale.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_product
-msgid "Sales Orders by Products"
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu1
-msgid "Monthly Sales Turnover Over One Year"
+#: view:sale.order:0
+msgid "Compute"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_turnover_product_tree
-#: model:ir.model,name:sale.model_report_turnover_per_product
-#: view:report.turnover.per.product:0
-msgid "Turnover Per Product"
+#: code:addons/sale/sale.py:618
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.next_id_82
-msgid "All Months"
+#: selection:sale.report,month:0
+msgid "January"
 msgstr ""
 
 #. module: sale
-#: field:report.sale.order.category,price_total:0
-#: field:report.sale.order.product,price_total:0
-msgid "Total Price"
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_category
-msgid "Sales Orders by Categories"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_sale_list
-#: model:ir.ui.menu,name:sale.menu_report_order_sale_list
-msgid "Sales of the Month"
+#: view:sale.report:0 field:sale.report,delay:0
+msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_product_tree
-#: model:ir.ui.menu,name:sale.menu_report_order_product
-msgid "Sales by Product (this month)"
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
 msgstr ""
 
 #. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_4
-#: model:ir.report.custom,title:sale.ir_report_custom_4
-msgid "Monthly sales turnover over one year"
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
 msgstr ""
 
 #. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management - Reporting"
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_category_tree_all
-#: model:ir.ui.menu,name:sale.menu_report_order_category_all
-#: view:report.sale.order.category:0
-msgid "Sales by Category of Products"
+#: field:sale.report,date:0
+msgid "Date Order"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu3
-msgid "Monthly Cumulated Sales Turnover Over One Year"
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
-#: field:report.sale.order.category,quantity:0
-#: field:report.sale.order.product,quantity:0
-msgid "# of Products"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_product_tree_all
-#: model:ir.ui.menu,name:sale.menu_report_order_product_all
-#: view:report.sale.order.product:0
-msgid "Sales by Product"
+#: code:addons/sale/sale.py:322
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.next_id_81
-msgid "This Month"
+#: selection:sale.order.line,type:0
+msgid "from stock"
 msgstr ""
 
 #. module: sale
-#: field:report.sale.order.category,category_id:0
-msgid "Categories"
+#: view:sale.open.invoice:0
+msgid "Close"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
-msgid "Created Sale Orders"
+#: code:addons/sale/sale.py:1261
+#, python-format
+msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.next_id_80
-msgid "Reporting"
+#: field:sale.order,shipped:0
+msgid "Delivered"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_turnover_month_tree
-#: model:ir.model,name:sale.model_report_turnover_per_month
-#: view:report.turnover.per.month:0
-msgid "Turnover Per Month"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu2
-msgid "Daily Sales Turnover Over One Year"
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
 msgstr ""
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.next_id_83
-msgid "Graphs"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: selection:report.sale.order.category,state:0
-#: selection:report.sale.order.product,state:0
-msgid "Manual in progress"
+#: report:sale.order:0 field:sale.order.line,name:0
+msgid "Description"
 msgstr ""
 
 #. module: sale
-#: field:report.turnover.per.month,turnover:0
-#: field:report.turnover.per.product,turnover:0
-msgid "Total Turnover"
+#: selection:sale.report,month:0
+msgid "May"
 msgstr ""
 
 #. module: sale
-#: selection:report.sale.order.category,state:0
-#: selection:report.sale.order.product,state:0
-msgid "In progress"
+#: view:sale.order:0 field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_category_tree
-#: model:ir.ui.menu,name:sale.menu_report_order_category
-msgid "Sales by Category of Product (this month)"
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
 msgstr ""
 
 #. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_5
-#: model:ir.report.custom,title:sale.ir_report_custom_5
-msgid "Daily sales turnover over one year"
+#: selection:sale.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: sale
-#: field:report.sale.order.category,name:0
-#: field:report.sale.order.product,name:0
-#: field:report.turnover.per.month,name:0
-msgid "Month"
+#: selection:sale.report,month:0
+msgid "April"
 msgstr ""
 
 #. module: sale
-#: field:report.sale.order.category,count:0
-#: field:report.sale.order.product,count:0
-msgid "# of Lines"
+#: view:sale.shop:0
+msgid "Accounting"
 msgstr ""
 
 #. module: sale
-#: field:report.sale.order.created,create_date:0
-msgid "Create Date"
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: view:report.sale.order.created:0
-msgid "Created Sales orders"
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_so_pipeline
-#: view:sale.order:0
-msgid "Sales by State"
+#: code:addons/sale/sale.py:1255
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
 msgstr ""
+
+#. module: sale
+#: field:sale.order,picked_rate:0 view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 26093c0961f..4b66102c2f0 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -157,7 +157,7 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.name) or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id and display_address(o.partner_shipping_id) ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
@@ -173,13 +173,13 @@
         </td>
         <td>
           <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id and display_address(o.partner_order_id) ]] </para>
+          <para style="terp_default_9">[[ o.partner_id and display_address(o.partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
@@ -351,14 +351,10 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="terp_default_9">[[ format(o.note or '') ]]</para>
     <blockTable colWidths="533.0" style="Table7">
       <tr>
         <td>
-          <para style="terp_default_9">[[ format(o.note or '') ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
           <para style="terp_default_9">[[ format(o.payment_term and o.payment_term.note or (o.partner_id.property_payment_term and o.partner_id.property_payment_term.note or '')) ]]</para>
         </td>
       </tr>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 5cc7c4f5ca1..4c1a85a7b86 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -128,8 +128,8 @@
         <field name="help">This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
     </record>
 
-    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11" groups="base.group_sale_manager"/>
-    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
+    <menuitem id="base.next_id_64" name="Sales" parent="base.menu_reporting" sequence="1" groups="base.group_sale_manager"/>
+    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="10"/>
 
     <!--This views used in board_sale module -->
     <record id="view_sales_by_partner_graph" model="ir.ui.view">
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index fb551eea0e7..95590f8f0c6 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -38,79 +38,74 @@ class sale_configuration(osv.osv_memory):
                 the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways
                 and to automatically creates project tasks from procurement lines.
                 This installs the modules project_timesheet and project_mrp."""),
-        'module_account_analytic_analysis': fields.boolean('Based on Timesheet',
+        'timesheet': fields.boolean('Based on Timesheet',
             help = """For modifying account analytic view to show important data to project manager of services companies.
                 You can also view the report of account analytic summary user-wise as well as month wise.
                 This installs the module account_analytic_analysis."""),
+        'module_account_analytic_analysis': fields.boolean('Manage Contracts',
+            help = """This installs the module account_analytic_analysis."""),
         'default_order_policy': fields.selection(
             [('manual', 'Invoice Based on Sales Orders'), ('picking', 'Invoice Based on Deliveries')],
             'Main Method Based On', required=True, default_model='sale.order',
             help="You can generate invoices based on sales orders or based on shippings."),
-        'module_delivery': fields.boolean('Charge delivery costs',
+        'module_delivery': fields.boolean('Charge Delivery Costs',
             help ="""Allows you to add delivery methods in sale orders and delivery orders.
                 You can define your own carrier and delivery grids for prices.
                 This installs the module delivery."""),
         'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
-        'default_picking_policy' : fields.boolean("Deliver all products at once",
+        'default_picking_policy' : fields.boolean("Deliver all Products at Once",
             help = "You can set picking policy on sale order that will allow you to deliver all products at once."),
         'group_sale_pricelist':fields.boolean("Pricelist per Customer",
             implied_group='product.group_sale_pricelist',
             help="""Allows to manage different prices based on rules per category of customers. 
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_uom':fields.boolean("Allow different UoM per product",
+        'group_uom':fields.boolean("Manage Different UoM for Products",
             implied_group='product.group_uom',
-            help="""Allows you to select and maintain different unit of measures per product."""),
-        'group_sale_delivery_address': fields.boolean("Specify delivery and invoice addresses",
+            help="""Allows you to select and maintain different units of measure for products."""),
+        'group_sale_delivery_address': fields.boolean("Allow Different Addresses for Delivery and Invoice",
             implied_group='sale.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a sale order."),
-        'group_discount_per_so_line': fields.boolean("Discount per sale order line",
+        'group_discount_per_so_line': fields.boolean("Discount per Line",
             implied_group='sale.group_discount_per_so_line',
-            help="Allows you to apply discount per sale order line."),
-        'module_sale_layout': fields.boolean("Notes & subtotals per line",
+            help="Allows you to apply some discount per sale order line."),
+        'module_sale_layout': fields.boolean("Notes & Subtotals per Line",
             help="""Allows to format sale order lines using notes, separators, titles and subtotals.
                 This installs the module sale_layout."""),
-        'module_warning': fields.boolean("Alerts by products or customers",
+        'module_warning': fields.boolean("Alerts by Products or Customers",
             help="""To raise user specific warning messages on different products used in Sales Orders, Purchase Orders, Invoices and Deliveries.
                 This installs the module warning."""),
-        'module_sale_margin': fields.boolean("Display Margins For Users",
+        'module_sale_margin': fields.boolean("Display Margins for Users",
             help="""This adds the 'Margin' on sales order.
                 This gives the profitability by calculating the difference between the Unit Price and Cost Price.
                 This installs the module sale_margin."""),
-        'module_sale_journal': fields.boolean("Invoice Journal",
-            help="""Allows you to categorize your sales and deliveries (picking lists) between different journals.
+        'module_sale_journal': fields.boolean("Allow Batch Invoicing through Journals",
+            help="""Allows you to categorize your sales and deliveries (picking lists) between different journals,
+                and perform batch operations on journals.
                 This installs the module sale_journal."""),
-        'module_analytic_user_function': fields.boolean("User function by contracts",
+        'module_analytic_user_function': fields.boolean("User Function by Contract",
             help="""Allows you to define what is the default function of a specific user on a given account.
                 This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.
                 But the possibility to change these values is still available.
                 This installs the module analytic_user_function."""),
-        'module_analytic_journal_billing_rate': fields.boolean("Billing rates by contracts",
+        'module_analytic_journal_billing_rate': fields.boolean("Billing Rates by Contract",
             help="""Allows you to define the default invoicing rate for a specific journal on a given account.
                 This installs the module analytic_journal_billing_rate."""),
-        'tax_policy': fields.selection(
-            [('no_tax', 'No Tax'), ('global_on_order', 'Global On Order'), ('on_order_line', 'On Order Lines')],
-            'Taxes', required=True,
-            help="""Choose between either applying global taxes on a sale order, or applying different taxes on sale order lines, or applying no tax at all."""),
-        'group_sale_taxes_global_on_order': fields.boolean("Global on order",
-            implied_group='sale.group_taxes_global_on_order'),
-        'group_sale_taxes_on_order_line': fields.boolean("On order line",
-            implied_group='sale.group_taxes_on_order_line'),
         'module_project_timesheet': fields.boolean("Project Timesheet"),
         'module_project_mrp': fields.boolean("Project MRP"),
+        'module_project': fields.boolean("Project"),
     }
 
     def default_get(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')
         res = super(sale_configuration, self).default_get(cr, uid, fields, context)
-        # task_work, time_unit and tax_policy depend on other fields
+        # task_work, time_unit depend on other fields
         res['task_work'] = res.get('module_project_mrp') and res.get('module_project_timesheet')
-        if res.get('module_account_analytic_analysis'):
+        if res.get('module_project'):
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            res['time_unit'] = user.company_id.project_time_mode_id.id
+        else:
             product = ir_model_data.get_object(cr, uid, 'product', 'product_consultant')
             res['time_unit'] = product.uom_id.id
-        res['tax_policy'] = \
-            (res.get('group_sale_taxes_global_on_order') and 'global_on_order') or \
-            (res.get('group_sale_taxes_on_order_line') and 'on_order_line') or \
-            'no_tax'
         return res
 
     def get_default_sale_config(self, cr, uid, ids, context=None):
@@ -127,7 +122,6 @@ class sale_configuration(osv.osv_memory):
     _defaults = {
         'default_order_policy': 'manual',
         'time_unit': _get_default_time_unit,
-        'tax_policy': 'no_tax',
     }
 
     def set_sale_defaults(self, cr, uid, ids, context=None):
@@ -142,22 +136,39 @@ class sale_configuration(osv.osv_memory):
             product = ir_model_data.get_object(cr, uid, 'product', 'product_consultant')
             product.write({'uom_id': wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
 
-        if wizard.task_work and wizard.time_unit:
+        if wizard.module_project and wizard.time_unit:
             user = self.pool.get('res.users').browse(cr, uid, uid, context)
             user.company_id.write({'project_time_mode_id': wizard.time_unit.id})
 
         return {}
 
+    def onchange_invoice_methods(self, cr, uid, ids, group_invoice_so_lines, group_invoice_deli_orders, context=None):
+        if not group_invoice_deli_orders:
+            return {'value': {'default_order_policy': 'manual'}}
+        if not group_invoice_so_lines:
+            return {'value': {'default_order_policy': 'picking'}}
+        return {}
+
     def onchange_task_work(self, cr, uid, ids, task_work, context=None):
         return {'value': {
             'module_project_timesheet': task_work,
             'module_project_mrp': task_work,
         }}
 
-    def onchange_tax_policy(self, cr, uid, ids, tax_policy, context=None):
+    def onchange_timesheet(self, cr, uid, ids, timesheet, context=None):
         return {'value': {
-            'group_sale_taxes_global_on_order': tax_policy == 'global_on_order',
-            'group_sale_taxes_on_order_line': tax_policy == 'on_order_line',
+            'timesheet': timesheet,
+            'module_account_analytic_analysis': timesheet,
         }}
 
+
+
+class account_config_settings(osv.osv_memory):
+    _inherit = 'account.config.settings'
+    _columns = {
+        'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales',
+            implied_group='sale.group_analytic_accounting',
+            help="Allows you to specify an analytic account on sale orders."),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 3025f26d37d..5c64121038b 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -10,10 +10,10 @@
             <field name="arch" type="xml">
                 <group name="config_sale" position="after">
                     <separator string="Picking and Invoice Policy" colspan="4"/>
-                    <field name="group_invoice_so_lines"/>
+                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
                     <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)]}"/>
                     <newline/>
-                    <field name="group_invoice_deli_orders"/>
+                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
                     <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
                     <newline/>
                     <field name="task_work" on_change="onchange_task_work(task_work)"/>
@@ -21,31 +21,41 @@
                     <field name="module_project_mrp" invisible="1"/>
                     <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
                     <newline/>
-                    <field name="module_account_analytic_analysis"/>
-                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]" attrs="{'invisible':[('task_work','=',False),('module_account_analytic_analysis','=',False)],'required': [('module_account_analytic_analysis','=',True)]}"/>
+                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
+                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
+                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
 
                     <separator string="Sale Order" colspan="4"/>
                     <field name="group_sale_pricelist"/>
                     <field name="group_uom"/>
-                    <newline/>
-                    <field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
-                    <field name="group_sale_taxes_global_on_order" invisible="1"/>
-                    <field name="group_sale_taxes_on_order_line" invisible="1"/>
                     <field name="group_sale_delivery_address"/>
-                    <newline/>
-                    <field name="module_sale_margin"/>
                     <field name="group_discount_per_so_line"/>
-                    <newline/>
-                    <field name="module_warning"/>
+                    <field name="module_sale_margin"/>
                     <field name="module_sale_layout"/>
-                    <newline/>
-                    <label colspan="2"/>
+                    <field name="module_warning"/>
                     <field name="module_sale_journal"/>
+
+                    <separator string="Contracts" colspan="4"/>
+                    <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
+                    <field name="module_analytic_user_function"/>
+                    <field name="module_analytic_journal_billing_rate"/>
                 </group>
             </field>
         </record>
 
         <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config" sequence="1" action="base.action_sale_config"/>
 
+        <record id="view_account_config" model="ir.ui.view">
+            <field name="name">account settings</field>
+            <field name="model">account.config.settings</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="arch" type="xml">
+                <group name="analytic_accounting" position="after">
+                    <field name="group_analytic_account_for_sales"/>
+                </group>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f52c2112ac3..2b9032d87f8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -65,7 +65,7 @@ class sale_order(osv.osv):
 
     def _amount_line_tax(self, cr, uid, line, context=None):
         val = 0.0
-        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
+        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.product_id, line.order_id.partner_id)['taxes']:
             val += c.get('amount', 0.0)
         return val
 
@@ -215,9 +215,8 @@ class sale_order(osv.osv):
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
         'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
         'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
-        'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
-        'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="The name and address of the contact who requested the order or quotation."),
-        'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
+        'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
+        'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
 
         'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
         'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')],
@@ -279,7 +278,6 @@ class sale_order(osv.osv):
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
         'invoice_quantity': 'order',
         'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
-        'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and  self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
     }
     _sql_constraints = [
@@ -347,7 +345,7 @@ class sale_order(osv.osv):
 
     def onchange_partner_id(self, cr, uid, ids, part):
         if not part:
-            return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False, 'partner_order_id': False, 'payment_term': False, 'fiscal_position': False}}
+            return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False,  'payment_term': False, 'fiscal_position': False}}
 
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['delivery', 'invoice', 'contact'])
         part = self.pool.get('res.partner').browse(cr, uid, part)
@@ -357,7 +355,6 @@ class sale_order(osv.osv):
         dedicated_salesman = part.user_id and part.user_id.id or uid
         val = {
             'partner_invoice_id': addr['invoice'],
-            'partner_order_id': addr['contact'],
             'partner_shipping_id': addr['delivery'],
             'payment_term': payment_term,
             'fiscal_position': fiscal_position,
@@ -429,8 +426,6 @@ class sale_order(osv.osv):
             'account_id': order.partner_id.property_account_receivable.id,
             'partner_id': order.partner_id.id,
             'journal_id': journal_ids[0],
-            'address_invoice_id': order.partner_invoice_id.id,
-            'address_contact_id': order.partner_order_id.id,
             'invoice_line': [(6, 0, lines)],
             'currency_id': order.pricelist_id.currency_id.id,
             'comment': order.note,
@@ -738,7 +733,7 @@ class sale_order(osv.osv):
             'product_uos': (line.product_uos and line.product_uos.id)\
                     or line.product_uom.id,
             'product_packaging': line.product_packaging.id,
-            'address_id': line.address_allotment_id.id or order.partner_shipping_id.id,
+            'partner_id': line.address_allotment_id.id or order.partner_shipping_id.id,
             'location_id': location_id,
             'location_dest_id': output_id,
             'sale_line_id': line.id,
@@ -760,7 +755,7 @@ class sale_order(osv.osv):
             'state': 'auto',
             'move_type': order.picking_policy,
             'sale_id': order.id,
-            'address_id': order.partner_shipping_id.id,
+            'partner_id': order.partner_shipping_id.id,
             'note': order.note,
             'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
             'company_id': order.company_id.id,
@@ -789,7 +784,7 @@ class sale_order(osv.osv):
         return True
 
     def _get_date_planned(self, cr, uid, order, line, start_date, context=None):
-        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)    
+        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)
         date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         return date_planned
 
@@ -925,7 +920,7 @@ class sale_order_line(osv.osv):
             context = {}
         for line in self.browse(cr, uid, ids, context=context):
             price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
-            taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)
+            taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty, line.product_id, line.order_id.partner_id)
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
@@ -964,7 +959,7 @@ class sale_order_line(osv.osv):
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
             help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
-        'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
+        'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
         'product_uom_qty': fields.float('Quantity (UoM)', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index d94c52d898d..423ac3b9343 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -11,7 +11,6 @@
             <field ref="base.res_partner_agrolait" name="partner_id"/>
             <field ref="base.res_partner_address_8" name="partner_invoice_id"/>
             <field ref="base.res_partner_address_8" name="partner_shipping_id"/>
-            <field ref="base.res_partner_address_8" name="partner_order_id"/>
             <field name="order_policy">picking</field>
             <field name="invoice_quantity">procurement</field> 
             <field name="note">Invoice after delivery</field>          
@@ -68,7 +67,6 @@
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_9"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_9"/>
-            <field name="partner_order_id" ref="base.res_partner_address_9"/>
             <field name="invoice_quantity">order</field>
             <field name="order_policy">postpaid</field>
             
@@ -104,7 +102,6 @@
             <field name="partner_id" ref="base.res_partner_agrolait"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_8"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_8"/>
-            <field name="partner_order_id" ref="base.res_partner_address_8"/>
             <field name="order_policy">prepaid</field>
         </record>
         <record id="line5" model="sale.order.line">
@@ -137,7 +134,6 @@
             <field name="partner_id" ref="base.res_partner_5"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_10"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_10"/>
-            <field name="partner_order_id" ref="base.res_partner_address_10"/>
         </record>
         <record id="line7" model="sale.order.line">
             <field name="order_id" ref="order4"/>
@@ -170,7 +166,6 @@
             <field name="partner_id" ref="base.res_partner_3"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_zen"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_zen"/>
-            <field name="partner_order_id" ref="base.res_partner_address_zen"/>
         </record>
         <record id="line9" model="sale.order.line">
             <field name="order_id" ref="order5"/>
@@ -203,7 +198,6 @@
             <field name="partner_id" ref="base.res_partner_maxtor"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_wong"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_wong"/>
-            <field name="partner_order_id" ref="base.res_partner_address_wong"/>
         </record>
         <record id="order6_line0" model="sale.order.line">
             <field name="order_id" ref="order6"/>
@@ -237,7 +231,6 @@
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_3000"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_3000"/>
-            <field name="partner_order_id" ref="base.res_partner_address_3000"/>
         </record>
         <record id="order7_line0" model="sale.order.line">
             <field name="order_id" ref="order7"/>
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 421cb36c440..5ce1156a206 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -7,9 +7,8 @@
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
             <field model="res.partner" name="partner_id" search="[]"/>
-            <field model="res.partner.address" name="partner_invoice_id" search="[]"/>
-            <field model="res.partner.address" name="partner_shipping_id" search="[]"/>
-            <field model="res.partner.address" name="partner_order_id" search="[]"/>
+            <field model="res.partner" name="partner_invoice_id" search="[]"/>
+            <field model="res.partner" name="partner_shipping_id" search="[]"/>
         </record>
         <!-- Resource: sale.order.line -->
         <record id="test_order_1_line_1" model="sale.order.line">
@@ -85,7 +84,7 @@
         </assert>
 
         <assert id="test_order_1" model="sale.order" severity="error" string="the sales order's picking will be sent to the good address and is already confirmed">
-            <test expr="picking_ids[0].address_id == partner_shipping_id"/>
+            <test expr="picking_ids[0].partner_id == partner_shipping_id"/>
             <!-- test expr="picking_ids[0].state">confirmed</test # Desactivated because of MRP_JIT -->
         </assert>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5bc47245c1d..f3a810f9692 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -4,10 +4,6 @@
             id="base.menu_base_partner" name="Sales"
             sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
-        <menuitem id="base.menu_sales" name="Sales"
-            parent="base.menu_base_partner" sequence="1"
-            />
-
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
         <record id="view_shop_form" model="ir.ui.view">
@@ -50,7 +46,7 @@
             <field name="help">If you have more than one shop reselling your company products, you can create and manage that from here. Whenever you will record a new quotation or sales order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sales.</field>
         </record>
 
-        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_sale_config_sales" sequence="0"/>
+        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="35"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
@@ -115,12 +111,11 @@
                     </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="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
+                            <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
+                            <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" 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)]"/>
+                            <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sales Order Lines">
@@ -137,9 +132,10 @@
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 name="product_uom_qty"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                            <field name="product_uom"
-                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"
-                                                nolabel="1" groups="product.group_uom"/>
+                                            <group colspan="1">
+                                                <field name="product_uom" nolabel="1" groups="product.group_uom"
+                                                    on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
+                                            </group>
                                             <field name="price_unit"/>
 
                                             <field groups="product.group_uos" name="product_uos_qty"/>
@@ -152,9 +148,8 @@
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
                                             <separator colspan="5" string="Notes" groups="base.group_sale_notes_subtotal"/>
                                             <field colspan="5" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/>
-                                            <separator colspan="5" string="Taxes" groups="sale.group_taxes_on_order_line"/>
-                                            <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" 
-                                                groups="sale.group_taxes_on_order_line" />
+                                            <separator colspan="5" string="Taxes"/>
+                                            <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <group colspan="5" col="5" groups="base.group_extended">
                                                 <separator colspan="5" string="States"/>
                                                 <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
@@ -165,7 +160,7 @@
                                             </group>
                                         </group>
                                         </page>
-                                        <page groups="base.group_extended" string="Extra Info">
+                                        <page string="Extra Info" groups="product.group_mrp_properties">
                                             <field name="type"/>
                                             <field name="delay"/>
                                             <field name="th_weight"/>
@@ -194,8 +189,8 @@
                             </field>
                             <newline/>
                             <group col="13" colspan="10">
-                                <field name="amount_untaxed" sum="Untaxed amount" groups="sale.group_taxes_on_order_line,sale.group_taxes_global_on_order"/>
-                                <field name="amount_tax" groups="sale.group_taxes_on_order_line,sale.group_taxes_global_on_order"/>
+                                <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"/>
@@ -236,7 +231,7 @@
                                 <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_extended">
+                            <group colspan="2" col="2" groups="base.group_no_one">
                                 <separator string="Dates" colspan="2"/>
                                 <field name="create_date"/>
                                 <field name="date_confirm"/>
@@ -261,8 +256,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]" help="Sales Order that haven't yet been confirmed"/>
-                    <filter icon="terp-check" string="Sales" domain="[('state','in',('manual','progress'))]"/>
+                    <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','=','draft')]" help="Sales Order that haven't yet been confirmed"/>
+                    <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <separator orientation="vertical"/>
@@ -292,10 +287,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
-            <field name="context">{}</field>
+            <field name="context">{"search_default_sales":1}</field>
             <field name="help">Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
         </record>
-        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3" groups="base.group_sale_salesman,base.group_sale_manager"/>
+        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="4" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <record id="action_order_tree2" model="ir.actions.act_window">
             <field name="name">Sales in Exception</field>
@@ -320,15 +315,19 @@
 
 
         <record id="action_order_tree5" model="ir.actions.act_window">
-            <field name="name">All Quotations</field>
+            <field name="name">Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','draft')]</field>
+            <field name="context">{"search_default_draft":1}</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
 
+        <menuitem id="menu_sale_quotations"
+        action="action_order_tree5" parent="base.menu_sales"
+        sequence="3" />
+
         <record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>
             <field name="type">ir.actions.act_window</field>
@@ -384,6 +383,7 @@
                         <field name="product_id" readonly="1"/>
                         <field name="product_uom_qty" readonly="1"/>
                         <field name="product_uom" groups="product.group_uom"/>
+                        <newline/>
 
                         <field colspan="4" name="name" groups="base.group_extended"/>
                         <field name="company_id" groups="base.group_multi_company" readonly="1"/>
@@ -462,7 +462,7 @@
         </record>
 
         <record id="action_order_line_tree2" model="ir.actions.act_window">
-            <field name="name">Lines to Invoice</field>
+            <field name="name">Order Lines to Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
@@ -500,7 +500,7 @@
             groups="base.group_sale_salesman"/>
 
         <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
-        <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="2" groups="sale.group_invoice_so_lines"/>
+        <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="10" groups="sale.group_invoice_so_lines"/>
 
     </data>
 </openerp>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index ee45aa65463..0cb55fb0d30 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -40,17 +40,13 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_taxes_global_on_order" model="res.groups">
-        <field name="name">Sales Taxes Global on Order</field>
+    <record id="group_analytic_accounting" model="res.groups">
+        <field name="name">Analytic Accounting for Sales</field>
         <field name="category_id" ref="base.module_category_hidden"/>
+        <field name="implied_ids" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
     </record>
 
-    <record id="group_taxes_on_order_line" model="res.groups">
-        <field name="name">Sales Taxes on Order Lines</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
-    <record model="res.users" id="base.user_admin">
+    <record model="res.users" id="base.user_root">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
     <record model="ir.ui.menu" id="base.menu_base_partner">
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index f13e512c008..44b993ec0e1 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -67,8 +67,6 @@ class stock_picking(osv.osv):
         """
         invoice_vals = super(stock_picking, self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context=context)
         if picking.sale_id:
-            invoice_vals['address_contact_id'] = picking.sale_id.partner_order_id.id
-            invoice_vals['address_invoice_id'] = picking.sale_id.partner_invoice_id.id
             invoice_vals['fiscal_position'] = picking.sale_id.fiscal_position.id
             invoice_vals['payment_term'] = picking.sale_id.payment_term.id
             invoice_vals['user_id'] = picking.sale_id.user_id.id
diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml
index c53ff9cfc45..af9a9b3aad6 100644
--- a/addons/sale/test/edi_sale_order.yml
+++ b/addons/sale/test/edi_sale_order.yml
@@ -4,7 +4,6 @@
   !record {model: sale.order, id: sale_order_edi_1}:
     partner_id: base.res_partner_agrolait
     partner_invoice_id: base.res_partner_address_8invoice
-    partner_order_id: base.res_partner_address_8invoice
     partner_shipping_id: base.res_partner_address_8invoice
     pricelist_id: 1
     order_line:
@@ -56,7 +55,7 @@
         "company_address": {
                 "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.some_address",
                 "__module": "base",
-                "__model": "res.partner.address",
+                "__model": "res.partner",
                 "phone": "(+32).81.81.37.00",
                 "street": "Chaussee de Namur 40",
                 "city": "Gerompont",
@@ -67,16 +66,6 @@
                 ],
         },
         "partner_id": ["purchase:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_test20", "jones white"],
-        "partner_address": {
-                "__id": "base:5af1272e-dd26-11e0-b65e-701a04e25543.res_partner_address_7wdsjasdjh",
-                "__module": "base",
-                "__model": "res.partner.address",
-                "phone": "(+32).81.81.37.00",
-                "street": "Chaussee de Namur 40",
-                "city": "Gerompont",
-                "zip": "1367",
-                "country_id": ["base:5af1272e-dd26-11e0-b65e-701a04e25543.be", "Belgium"],
-        },
         "order_line": [{
                 "__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_line-AlhsVDZGoKvJ",
                 "__module": "purchase",
@@ -129,4 +118,4 @@
             assert sale_line.price_unit == 100 , "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
             assert sale_line.product_uom_qty == 2 , "product qty is not same"
         else:
-            raise AssertionError('unknown order line: %s' % sale_line)
\ No newline at end of file
+            raise AssertionError('unknown order line: %s' % sale_line)
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index a4f88c8c7ae..f2e3cd0e24a 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -52,7 +52,7 @@
       assert picking.origin == sale_order.name,"Origin of Delivery order is not correspond with sequence number of sale order."
       assert picking.type == 'out',"Shipment should be Outgoing."
       assert picking.move_type == sale_order.picking_policy,"Delivery Method is not corresponding with delivery method of sale order."
-      assert picking.address_id.id == sale_order.partner_shipping_id.id,"Shipping Address is not correspond with sale order."
+      assert picking.partner_id.id == sale_order.partner_shipping_id.id,"Shipping Address is not correspond with sale order."
       assert picking.note == sale_order.note,"Note is not correspond with sale order."
       assert picking.invoice_state == (sale_order.order_policy=='picking' and '2binvoiced') or 'none',"Invoice policy is not correspond with sale order."
       assert len(picking.move_lines) == len(sale_order.order_line), "Total move of delivery order are not corresposning with total sale order lines."
@@ -69,7 +69,7 @@
          assert move.product_uos_qty == (order_line.product_uos and order_line.product_uos_qty) or order_line.product_uom_qty,"Product UOS Quantity is not correspond."
          assert move.product_uos == (order_line.product_uos and order_line.product_uos.id) or order_line.product_uom.id,"Product UOS is not correspond"
          assert move.product_packaging.id == order_line.product_packaging.id,"Product packaging is not correspond."
-         assert move.address_id.id == order_line.address_allotment_id.id or sale_order.partner_shipping_id.id,"Address is not correspond"
+         assert move.partner_id.id == order_line.address_allotment_id.id or sale_order.partner_shipping_id.id,"Address is not correspond"
          #assert move.location_id.id == location_id,"Source Location is not correspond."
          #assert move.location_dest_id == output_id,"Destination Location is not correspond."
          assert move.note == order_line.notes,"Note is not correspond"
@@ -116,7 +116,6 @@
         assert invoice.account_id.id == ac,"Invoice account is not correspond."
         assert invoice.reference == order.client_order_ref or order.name,"Reference is not correspond."
         assert invoice.partner_id.id == order.partner_id.id,"Customer is not correspond."
-        assert invoice.address_invoice_id.id == order.partner_invoice_id.id,"Invoice Address is not correspond."
         assert invoice.currency_id.id == order.pricelist_id.currency_id.id, "Currency is not correspond."
         assert invoice.comment == order.note or '',"Note is not correspond."
         assert invoice.journal_id.id in journal_ids,"Sales Journal is not link on Invoice."
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 45347a5e131..cfd19252d96 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -66,8 +66,6 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 'reference': "P%dSO%d" % (order.partner_id.id, order.id),
                 'account_id': a,
                 'partner_id': order.partner_id.id,
-                'address_invoice_id': order.partner_invoice_id.id,
-                'address_contact_id': order.partner_invoice_id.id,
                 'invoice_line': [(6, 0, lines)],
                 'currency_id' : order.pricelist_id.currency_id.id,
                 'comment': order.note,
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index cb9bb2fc5bd..b51fd9bcb93 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -92,8 +92,6 @@ class sale_advance_payment_inv(osv.osv_memory):
                     'reference': False,
                     'account_id': sale.partner_id.property_account_receivable.id,
                     'partner_id': sale.partner_id.id,
-                    'address_invoice_id': sale.partner_invoice_id.id,
-                    'address_contact_id': sale.partner_order_id.id,
                     'invoice_line': [(6, 0, create_ids)],
                     'currency_id': sale.pricelist_id.currency_id.id,
                     'comment': '',
diff --git a/addons/sale_crm/i18n/lv.po b/addons/sale_crm/i18n/lv.po
new file mode 100644
index 00000000000..bd41955daf3
--- /dev/null
+++ b/addons/sale_crm/i18n/lv.po
@@ -0,0 +1,138 @@
+# Latvian 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:37+0000\n"
+"PO-Revision-Date: 2012-03-21 14:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@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-03-22 04:56+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: sale_crm
+#: field:sale.order,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:112
+#, python-format
+msgid "Converted to Sales Quotation(%s)."
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr ""
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Opportunities"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Opportunity  '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#~ msgid "Opportunities by Stage"
+#~ msgstr "Izdevības pēc Posma"
diff --git a/addons/sale_crm/i18n/nb.po b/addons/sale_crm/i18n/nb.po
new file mode 100644
index 00000000000..844a80bbf78
--- /dev/null
+++ b/addons/sale_crm/i18n/nb.po
@@ -0,0 +1,135 @@
+# Norwegian Bokmal 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:37+0000\n"
+"PO-Revision-Date: 2012-04-02 11:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-03 04:53+0000\n"
+"X-Generator: Launchpad (build 15052)\n"
+
+#. module: sale_crm
+#: field:sale.order,categ_id:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:112
+#, python-format
+msgid "Converted to Sales Quotation(%s)."
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Utilstrekkelig data!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "Kunden har ikke definert en adresse!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Opprett"
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr "Mine salgsteam"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Opportunities"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Butikk"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Opportunity  '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Salgsteam"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Lag tilbud"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index c3515cc5b0b..fe79815fbee 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -95,7 +95,6 @@ class crm_make_sale(osv.osv_memory):
                     'partner_id': partner.id,
                     'pricelist_id': pricelist,
                     'partner_invoice_id': partner_addr['invoice'],
-                    'partner_order_id': partner_addr['contact'],
                     'partner_shipping_id': partner_addr['delivery'],
                     'date_order': fields.date.context_today(self,cr,uid,context=context),
                     'fiscal_position': fpos,
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index a320a55d02b..3979318e299 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -43,8 +43,8 @@
             <field name="help">Invoice types are used for partners, sales orders and delivery orders. You can create a specific invoicing journal to group your invoicing according to your customer's needs: daily, each Wednesday, monthly, etc.</field>
         </record>
 
-     <menuitem id="menu_definition_journal_invoice_type"
-        parent="base.menu_sale_config_sales" action="action_definition_journal_invoice_type"/>
+     <menuitem id="menu_definition_journal_invoice_type" sequence="15"
+        parent="base.menu_sales_configuration_misc" action="action_definition_journal_invoice_type" groups="base.group_no_one"/>
 
     <!-- Inherit sales order form view -->
 
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index bd142f123bd..b0d4b64e6a8 100644
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -154,14 +154,14 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id and display_address(o.partner_order_id) ]] </para>
+          <para style="terp_default_9">[[ (o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+          <para style="terp_default_9">[[ display_address(o.partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TVA : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
@@ -343,14 +343,10 @@
         </td>
       </tr>
     </blockTable>
+    <para style="terp_default_9">[[ format(o.note or '') ]]</para>
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_default_9">[[ format(o.note or '') ]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
           <para style="terp_default_9">[[ format((o.partner_id and o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
         </td>
       </tr>
@@ -359,4 +355,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml
index 75eabce03b1..59999a782fa 100644
--- a/addons/sale_margin/test/sale_margin.yml
+++ b/addons/sale_margin/test/sale_margin.yml
@@ -22,7 +22,6 @@
     order_policy: manual
     partner_id: base.res_partner_4
     partner_invoice_id: base.res_partner_address_7
-    partner_order_id: base.res_partner_address_7
     partner_shipping_id: base.res_partner_address_7
     picking_policy: direct
     pricelist_id: product.list0
diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml
index 739eea0d99d..a29c2c10d01 100644
--- a/addons/sale_mrp/test/sale_mrp.yml
+++ b/addons/sale_mrp/test/sale_mrp.yml
@@ -80,7 +80,6 @@
     order_policy: manual
     partner_id: base.res_partner_4
     partner_invoice_id: base.res_partner_address_7
-    partner_order_id: base.res_partner_address_7
     partner_shipping_id: base.res_partner_address_7
     picking_policy: direct
     pricelist_id: product.list0
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index 1e92ac44a53..29971077a2c 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -12,6 +12,7 @@
             <field name="comment">
 Members of this groups have access to the sharing wizard, which allows them to invite external users to view or edit some of their documents.</field>
             <field name="category_id" ref="module_category_share"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 38ff4a9d854..b8de9cf445e 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -68,7 +68,7 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_stock" name="Dashboard"  sequence="0" parent="stock.next_id_61"/>
+        <menuitem id="menu_dashboard_stock" name="Warehouse"  sequence="10" parent="base.menu_reporting_dashboard"/>
         <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
 
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index d548a8bea8d..b597022cc72 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/i18n/cs.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-11-07 12:57+0000\n"
+"PO-Revision-Date: 2012-03-30 09:54+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:58+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-03-31 05:08+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: stock
@@ -243,7 +243,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not Applicable"
-msgstr "Nelze aplikovat"
+msgstr "Nelze použít"
 
 #. module: stock
 #: help:stock.tracking,serial:0
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index a808ed559d3..e11e7c21bba 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-11-07 12:51+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-03-20 02:26+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:01+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-03-21 05:00+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -24,7 +24,7 @@ msgstr "跟踪出库批次"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr ""
+msgstr "库存调拨拆分明细"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -89,7 +89,7 @@ msgstr "产品调拨"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "计量单位分类"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
@@ -183,7 +183,7 @@ msgstr "库存账簿"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Current month"
-msgstr ""
+msgstr "本月"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:222
@@ -217,7 +217,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Delivery Orders"
-msgstr ""
+msgstr "安排送货单"
 
 #. module: stock
 #: field:stock.partial.move.line,update_cost:0
@@ -289,7 +289,7 @@ msgstr "如果勾选，所有产品数量将设为零以确保实物盘点操作
 #. module: stock
 #: view:stock.partial.move:0 view:stock.partial.picking:0
 msgid "_Validate"
-msgstr ""
+msgstr "验证(_V)"
 
 #. module: stock
 #: code:addons/stock/stock.py:1149
@@ -337,7 +337,7 @@ msgstr "无发票"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that have been processed"
-msgstr ""
+msgstr "库存调拨已经被处理"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -454,7 +454,7 @@ msgstr "分拆到"
 #. module: stock
 #: view:stock.location:0
 msgid "Internal Locations"
-msgstr ""
+msgstr "内部库位"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
@@ -586,7 +586,7 @@ msgstr "库位/产品"
 #. module: stock
 #: field:stock.move,address_id:0
 msgid "Destination Address "
-msgstr ""
+msgstr "目的地址 "
 
 #. module: stock
 #: code:addons/stock/stock.py:1333
@@ -751,7 +751,7 @@ msgstr "处理装箱单"
 #. module: stock
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "编号必须在公司内唯一！"
 
 #. module: stock
 #: code:addons/stock/product.py:417
@@ -849,7 +849,7 @@ msgstr "更改产品数量"
 #. module: stock
 #: field:report.stock.inventory,month:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -1000,7 +1000,7 @@ msgstr "视图"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Last month"
-msgstr ""
+msgstr "上月"
 
 #. module: stock
 #: field:stock.location,parent_left:0
@@ -1185,7 +1185,7 @@ msgstr "业务伙伴库位"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Current year"
-msgstr ""
+msgstr "当年"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -1324,7 +1324,7 @@ msgstr "来自"
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "收货已处理"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:99
@@ -1490,7 +1490,7 @@ msgstr "订单日期"
 #: code:addons/stock/wizard/stock_change_product_qty.py:88
 #, python-format
 msgid "INV: %s"
-msgstr "发票: %s"
+msgstr "盘点:%s"
 
 #. module: stock
 #: view:stock.location:0 field:stock.location,location_id:0
@@ -1540,7 +1540,7 @@ msgstr "强制指定所有库存调拨产品的的生产批次和要发往的客
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr "库存发票在路上"
+msgstr "发票未到"
 
 #. module: stock
 #: help:stock.move,state:0
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index a70610f9311..5a90c20aa81 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -6,20 +6,20 @@
   -->
 
     <record id="view_partner_property_form" model="ir.ui.view">
-      <field name="name">res.partner.stock.property.form.inherit</field>
-      <field name="model">res.partner</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.view_partner_form"/>
-      <field name="arch" type="xml">
-        <page string="Sales &amp; Purchases" position="inside">
-          <group colspan="2" col="2" groups="stock.group_inventory_properties">
-            <separator string="Inventory Properties" colspan="2"/>
-            <field name="property_stock_customer" domain="[('usage','=','customer')]" groups="stock.group_inventory_properties" />
-            <field name="property_stock_supplier" domain="[('usage','=','supplier')]" groups="stock.group_inventory_properties"/>
-          </group>
-        </page>
-      </field>
+        <field name="name">res.partner.stock.property.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <page string="Sales &amp; Purchases" position="inside">
+                <group colspan="2" col="2" groups="stock.group_locations">
+                    <separator string="Inventory Properties" colspan="2"/>
+                    <field name="property_stock_customer" domain="[('usage','=','customer')]"/>
+                    <field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
+                </group>
+            </page>
+        </field>
     </record>
 
   </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 8ac755af498..19533933002 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -40,12 +40,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                 <page position="after" string="Information">
+                <page position="after" string="Information">
                     <page string="Properties">
-                        <separator string="Counter-Part Locations Properties" groups="stock.group_counterpart_location" colspan="4"/>
-                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]" groups="stock.group_counterpart_location"/>
-                        <field name="property_stock_production" domain="[('usage','=','production')]" groups="stock.group_counterpart_location"/>
-                        <field name="property_stock_inventory" domain="[('usage','=','inventory')]" groups="stock.group_counterpart_location"/>
+                        <separator string="Counter-Part Locations Properties" groups="stock.group_locations" colspan="4"/>
+                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production" domain="[('usage','=','production')]"/>
+                        <field name="property_stock_inventory" domain="[('usage','=','inventory')]"/>
                         <separator string="Accounting Entries" colspan="4"/>
                         <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
@@ -79,7 +79,7 @@
             <field name="priority">26</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/group[@name='properties']" position="before">
-                    <group groups="base.group_extended">
+                    <group groups="stock.group_inventory_valuation">
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
                             <field name="valuation" attrs="{'readonly':[('type', '=', 'service')]}"/>
@@ -169,7 +169,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="store" position="after">
-                    <group col="2" colspan="2" name="store" groups="stock.group_counterpart_location">
+                    <group col="2" colspan="2" name="store" groups="stock.group_locations">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
                         <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 96c12ceb404..63706a940e6 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -162,13 +162,13 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Shipping Address :</para>
-          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title.name) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ picking.address_id and display_address(picking.address_id) ]]</para>
+          <para style="terp_default_9">[[ (picking.partner_id and picking.partner_id.id and picking.partner_id.title.name) or '' ]] [[ picking.partner_id and picking.partner_id.id and picking.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id,'delivery') ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
-          <para style="terp_default_9">[[ picking.address_id and picking.address_id.title.name or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ picking.address_id and display_address(picking.address_id) ]] </para>
+          <para style="terp_default_9">[[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id,'default') ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -218,7 +218,7 @@
           <para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title.name) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
+          <para style="terp_default_Centre_8">[[ (picking.partner_id and picking.partner_id.title.name) or '' ]] [[ (picking.partner_id and picking.partner_id.name) or '' ]] </para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 8b18331d2bf..da6be7873c3 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -35,7 +35,7 @@ class report_stock_move(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'picking_id':fields.many2one('stock.picking', 'Packing', readonly=True),
@@ -76,7 +76,7 @@ class report_stock_move(osv.osv):
                         al.product_qty,
                         al.out_qty as product_qty_out,
                         al.in_qty as product_qty_in,
-                        al.address_id as partner_id,
+                        al.partner_id as partner_id,
                         al.product_id as product_id,
                         al.state as state ,
                         al.product_uom as product_uom,
@@ -113,7 +113,7 @@ class report_stock_move(osv.osv):
                         sm.location_dest_id as location_dest_id,
                         sum(sm.product_qty) as product_qty,
                         pt.categ_id as categ_id ,
-                        sm.address_id as address_id,
+                        sm.partner_id as partner_id,
                         sm.product_id as product_id,
                         sm.picking_id as picking_id,
                             sm.company_id as company_id,
@@ -129,7 +129,7 @@ class report_stock_move(osv.osv):
                           LEFT JOIN product_uom pu2 ON (sm.product_uom=pu2.id)
                         LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
                     GROUP BY
-                        sm.id,sp.type, sm.date,sm.address_id,
+                        sm.id,sp.type, sm.date,sm.partner_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
                         sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
                         sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id, sp.stock_journal_id)
@@ -137,7 +137,7 @@ class report_stock_move(osv.osv):
                     GROUP BY
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
-                        al.address_id,al.product_id,al.state,al.product_uom,
+                        al.partner_id,al.product_id,al.state,al.product_uom,
                         al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id, al.stock_journal
                )
         """)
@@ -154,7 +154,7 @@ class report_stock_inventory(osv.osv):
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September')]),
-        'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
@@ -173,7 +173,7 @@ class report_stock_inventory(osv.osv):
 CREATE OR REPLACE view report_stock_inventory AS (
     (SELECT
         min(m.id) as id, m.date as date,
-        m.address_id as partner_id, m.location_id as location_id,
+        m.partner_id as partner_id, m.location_id as location_id,
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
@@ -190,12 +190,12 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
-        m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id,  m.location_dest_id,
+        m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id,  m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
-        m.address_id as partner_id, m.location_dest_id as location_id,
+        m.partner_id as partner_id, m.location_dest_id as location_id,
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
@@ -211,7 +211,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
-        m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id,
+        m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id, m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
     )
 );
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 4f320ab58a9..029e514c33e 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -4,8 +4,9 @@
 
     <menuitem
         id="stock.next_id_61"
-        name="Reporting"
-        parent="stock.menu_stock_root"/>
+        name="Warehouse"
+        sequence="15"
+        parent="base.menu_reporting"/>
 
     <record id="view_stock_tree" model="ir.ui.view">
         <field name="name">report.stock.move.tree</field>
@@ -261,7 +262,7 @@
         <field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company  activities.</field>
     </record>
     <menuitem action="action_stock_inventory_report"
-        id="menu_action_stock_inventory_report" 
+        id="menu_action_stock_inventory_report"
         parent="next_id_61" sequence="4"/>
 
 
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 1061a405382..0113149278c 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -26,21 +26,20 @@ class stock_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_no_autopicking': fields.boolean(
-            "Allow an intermediate picking process to provide raw materials to production orders",
+        'module_stock_no_autopicking': fields.boolean("Force Picking before Manufactoring Orders",
             help="""This module allows an intermediate picking process to provide raw materials to production orders.
                 For example to manage production made by your suppliers (sub-contracting).
                 To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
                 and put the location of the supplier in the routing of the assembly operation.
                 This installs the module stock_no_autopicking."""),
-        'module_claim_from_delivery': fields.boolean("Track claim issue from delivery",
+        'module_claim_from_delivery': fields.boolean("Track Claims from Delivery",
             help="""Adds a Claim link to the delivery order.
                 This installs the module claim_from_delivery."""),
-        'module_stock_invoice_directly': fields.boolean("Invoice picking right after delivery",
+        'module_stock_invoice_directly': fields.boolean("Invoice Picking on Delivery",
             help="""This allows to automatically launch the invoicing wizard if the delivery is
                 to be invoiced when you send or deliver goods.
                 This installs the module stock_invoice_directly."""),
-        'module_product_expiry': fields.boolean("Allow to manage expiry date on product",
+        'module_product_expiry': fields.boolean("Expiry Date on Lots",
             help="""Track different dates on products and production lots.
                 The following dates can be tracked:
                     - end of life
@@ -48,28 +47,35 @@ class stock_config_settings(osv.osv_memory):
                     - removal date
                     - alert date.
                 This installs the module product_expiry."""),
-        'group_uom': fields.boolean("Allow different UoM per product",
+        'module_stock_location': fields.boolean("Push/Pull Logistic Rules",
+            help="""Provide push and pull inventory flows.  Typical uses of this feature are:
+                manage product manufacturing chains, manage default locations per product,
+                define routes within your warehouse according to business needs, etc.
+                This installs the module stock_location."""),
+        'group_uom': fields.boolean("Manage Different UoM for Products",
             implied_group='product.group_uom',
-            help="""Allows you to select and maintain different unit of measures per product."""),
-        'group_stock_packaging': fields.boolean("Manage packaging by products",
+            help="""Allows you to select and maintain different units of measure for products."""),
+        'group_uos': fields.boolean("Manage Secondary UoM (for Sale)",
+            implied_group='product.group_uos',
+            help="""Allows you to sell units of a product, but invoice based on a different unit of measure.
+                For instance, you can sell pieces of meat that you invoice based on their weight."""),
+        'group_stock_packaging': fields.boolean("Manage Product Packaging",
             implied_group='product.group_stock_packaging',
             help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
-        'group_stock_production_lot': fields.boolean("Track production lots",
+        'group_stock_production_lot': fields.boolean("Serial Numbers on Products",
             implied_group='stock.group_production_lot',
-            help="""This allows you to manage products produced by you using production lots (serial numbers).
+            help="""This allows you to manage products by using serial numbers.
                 When you select a lot, you can get the upstream or downstream traceability of the products contained in lot."""),
-        'group_stock_tracking_lot': fields.boolean("Track lots of your incoming and outgoing products",
+        'group_stock_tracking_lot': fields.boolean("Serial Numbers on Pallets (Logistic Units)",
             implied_group='stock.group_tracking_lot',
             help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
-        'group_stock_inventory_valuation': fields.boolean("Track inventory valuation by products",
+        'group_stock_inventory_valuation': fields.boolean("Accounting Entries per Stock Movement",
             implied_group='stock.group_inventory_valuation',
             help="""This allows to split stock inventory lines according to production lots."""),
-        'group_stock_counterpart_location': fields.boolean("Manage your stock counterpart by products",
-            implied_group='stock.group_counterpart_location',
-            help="""This allows to use different stock locations instead of the default one for procurement, production and inventory."""),
-        'group_stock_inventory_properties': fields.boolean("Define stock locations",
-            implied_group='stock.group_inventory_properties',
-            help="""This allows you to set destination location for goods you send to partner, or goods you receive from the current partner."""),
+        'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses",
+            implied_group='stock.group_locations',
+            help="""This allows to configure and use multiple stock locations and warehouses,
+                instead of having a single default one."""),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 07de945cb22..b98cb993f6c 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -10,28 +10,30 @@
                 <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"/>
-                    <newline/>
-                    <field name="module_product_expiry"/>
-                    <newline/>
 
                     <separator string="Logistics" colspan="4"/>
+                    <field name="group_stock_multiple_locations"/>
                     <field name="module_stock_no_autopicking"/>
-                    <newline/>
+                    <field name="module_stock_location"/>
                     <field name="module_stock_invoice_directly"/>
-                    <newline/>
 
                     <separator string="Products" colspan="4"/>
                     <field name="group_stock_packaging"/>
                     <field name="group_stock_inventory_valuation"/>
                     <field name="group_uom"/>
-                    <field name="group_stock_counterpart_location"/>
+                    <field name="group_uos"/>
 
                     <separator string="Partners" colspan="4"/>
-                    <field name="group_stock_inventory_properties"/>
-                    <newline/>
                     <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"/>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 11a0acc02d0..a9653ffa81e 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_warehouse_management"/>
         <field name="implied_ids" eval="[(4, ref('group_stock_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record id="group_production_lot" model="res.groups">
@@ -27,13 +28,8 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_counterpart_location" model="res.groups">
-        <field name="name">Manage Counter-Part Locations</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
-    <record id="group_inventory_properties" model="res.groups">
-        <field name="name">Manage Inventory properties in partner form</field>
+    <record id="group_locations" model="res.groups">
+        <field name="name">Manage Multiple Locations and Warehouses</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 885f7cd2077..e2b34d9f542 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -190,7 +190,7 @@ class stock_location(osv.osv):
         'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', help="Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."),
         'chained_company_id': fields.many2one('res.company', 'Chained Company', help='The company the Picking List containing the chained move will belong to (leave empty to use the default company determination rules'),
         'chained_delay': fields.integer('Chaining Lead Time',help="Delay between original move and chained move in days"),
-        'address_id': fields.many2one('res.partner.address', 'Location Address',help="Address of  customer or supplier."),
+        'partner_id': fields.many2one('res.partner', 'Location Address',help="Address of  customer or supplier."),
         'icon': fields.selection(tools.icons, 'Icon', size=64,help="Icon show in  hierarchical tree view"),
 
         'comment': fields.text('Additional Information'),
@@ -646,8 +646,7 @@ class stock_picking(osv.osv):
                  store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
         'auto_picking': fields.boolean('Auto-Picking'),
-        'address_id': fields.many2one('res.partner.address', 'Address', help="Address of partner"),
-        'partner_id': fields.related('address_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
@@ -877,7 +876,7 @@ class stock_picking(osv.osv):
             @param picking: object of the picking for which we are selecting the partner to invoice
             @return: object of the partner to invoice
         """
-        return picking.address_id and picking.address_id.partner_id
+        return picking.partner_id and picking.partner_id.id
 
     def _get_comment_invoice(self, cr, uid, picking):
         """
@@ -917,11 +916,11 @@ class stock_picking(osv.osv):
         else:
             taxes = move_line.product_id.taxes_id
 
-        if move_line.picking_id and move_line.picking_id.address_id and move_line.picking_id.address_id.partner_id:
+        if move_line.picking_id and move_line.picking_id.partner_id and move_line.picking_id.partner_id.id:
             return self.pool.get('account.fiscal.position').map_tax(
                 cr,
                 uid,
-                move_line.picking_id.address_id.partner_id.property_account_position,
+                move_line.picking_id.partner_id.property_account_position,
                 taxes
             )
         else:
@@ -981,13 +980,12 @@ class stock_picking(osv.osv):
             @param journal_id: ID of the accounting journal
             @return: dict that will be used to create the invoice object
         """
+        if isinstance(partner, int):
+            partner = self.pool.get('res.partner').browse(cr, uid, partner, context=context)
         if inv_type in ('out_invoice', 'out_refund'):
             account_id = partner.property_account_receivable.id
         else:
             account_id = partner.property_account_payable.id
-        address_contact_id, address_invoice_id = \
-                self.pool.get('res.partner').address_get(cr, uid, [partner.id],
-                        ['contact', 'invoice']).values()
         comment = self._get_comment_invoice(cr, uid, picking)
         invoice_vals = {
             'name': picking.name,
@@ -995,8 +993,6 @@ class stock_picking(osv.osv):
             'type': inv_type,
             'account_id': account_id,
             'partner_id': partner.id,
-            'address_invoice_id': address_invoice_id,
-            'address_contact_id': address_contact_id,
             'comment': comment,
             'payment_term': partner.property_payment_term and partner.property_payment_term.id or False,
             'fiscal_position': partner.property_account_position.id,
@@ -1077,6 +1073,7 @@ class stock_picking(osv.osv):
 
         invoice_obj = self.pool.get('account.invoice')
         invoice_line_obj = self.pool.get('account.invoice.line')
+        partner_obj = self.pool.get('res.partner')
         invoices_group = {}
         res = {}
         inv_type = type
@@ -1084,6 +1081,8 @@ class stock_picking(osv.osv):
             if picking.invoice_state != '2binvoiced':
                 continue
             partner = self._get_partner_to_invoice(cr, uid, picking, context=context)
+            if isinstance(partner, int):
+                partner = partner_obj.browse(cr, uid, [partner], context=context)[0]
             if not partner:
                 raise osv.except_osv(_('Error, no partner !'),
                     _('Please put a partner on the picking list if you want to generate invoice.'))
@@ -1177,7 +1176,7 @@ class stock_picking(osv.osv):
     def do_partial(self, cr, uid, ids, partial_datas, context=None):
         """ Makes partial picking and moves done.
         @param partial_datas : Dictionary containing details of partial picking
-                          like partner_id, address_id, delivery_date,
+                          like partner_id, partner_id, delivery_date,
                           delivery moves with product_id, product_qty, uom
         @return: Dictionary of values
         """
@@ -1277,7 +1276,7 @@ class stock_picking(osv.osv):
                         {
                             'product_qty' : move.product_qty - partial_qty[move.id],
                             'product_uos_qty': move.product_qty - partial_qty[move.id], #TODO: put correct uos_qty
-                            
+
                         })
 
             if new_picking:
@@ -1379,7 +1378,7 @@ class stock_production_lot(osv.osv):
                 name = '%s [%s]' % (name, record['ref'])
             res.append((record['id'], name))
         return res
-    
+
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         args = args or []
         ids = []
@@ -1580,7 +1579,7 @@ class stock_move(osv.osv):
 
         'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True,states={'done': [('readonly', True)]}, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True,states={'done': [('readonly', True)]}, select=True, help="Location where the system will stock the finished products."),
-        'address_id': fields.many2one('res.partner.address', 'Destination Address ', states={'done': [('readonly', True)]}, help="Optional address where goods are to be delivered, specifically used for allotment"),
+        'partner_id': fields.many2one('res.partner', 'Destination Address ', states={'done': [('readonly', True)]}, help="Optional address where goods are to be delivered, specifically used for allotment"),
 
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', states={'done': [('readonly', True)]}, help="Production lot is used to put a serial number on the production", select=True),
         'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, states={'done': [('readonly', True)]}, help="Logistical shipping unit: pallet, box, pack ..."),
@@ -1598,7 +1597,6 @@ class stock_move(osv.osv):
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
         'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
-        'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner", store=True, select=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order", select=True),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin", store=True),
 
@@ -1628,7 +1626,6 @@ class stock_move(osv.osv):
         mod_obj = self.pool.get('ir.model.data')
         picking_type = context.get('picking_type')
         location_id = False
-
         if context is None:
             context = {}
         if context.get('move_line', []):
@@ -1639,7 +1636,7 @@ class stock_move(osv.osv):
                     move_list = self.pool.get('stock.move').read(cr, uid, context['move_line'][0], ['location_dest_id'])
                     location_id = move_list and move_list['location_dest_id'][0] or False
         elif context.get('address_out_id', False):
-            property_out = self.pool.get('res.partner.address').browse(cr, uid, context['address_out_id'], context).partner_id.property_stock_customer
+            property_out = self.pool.get('res.partner').browse(cr, uid, context['address_out_id'], context).property_stock_customer
             location_id = property_out and property_out.id or False
         else:
             location_xml_id = False
@@ -1667,9 +1664,9 @@ class stock_move(osv.osv):
             except:
                 pass
         elif context.get('address_in_id', False):
-            part_obj_add = self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context=context)
-            if part_obj_add.partner_id:
-                location_id = part_obj_add.partner_id.property_stock_supplier.id
+            part_obj_add = self.pool.get('res.partner').browse(cr, uid, context['address_in_id'], context=context)
+            if part_obj_add:
+                location_id = part_obj_add.property_stock_supplier.id
         else:
             location_xml_id = False
             if picking_type == 'in':
@@ -1803,21 +1800,21 @@ class stock_move(osv.osv):
         return {'value': result}
 
     def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False,
-                            loc_dest_id=False, address_id=False):
+                            loc_dest_id=False, partner_id=False):
         """ On change of product id, if finds UoM, UoS, quantity and UoS quantity.
         @param prod_id: Changed Product id
         @param loc_id: Source location id
         @param loc_dest_id: Destination location id
-        @param address_id: Address id of partner
+        @param partner_id: Address id of partner
         @return: Dictionary of values
         """
         if not prod_id:
             return {}
         lang = False
-        if address_id:
-            addr_rec = self.pool.get('res.partner.address').browse(cr, uid, address_id)
+        if partner_id:
+            addr_rec = self.pool.get('res.partner').browse(cr, uid, partner_id)
             if addr_rec:
-                lang = addr_rec.partner_id and addr_rec.partner_id.lang or False
+                lang = addr_rec and addr_rec.lang or False
         ctx = {'lang': lang}
 
         product = self.pool.get('product.product').browse(cr, uid, [prod_id], context=ctx)[0]
@@ -1857,7 +1854,7 @@ class stock_move(osv.osv):
                 cr,
                 uid,
                 m.location_dest_id,
-                m.picking_id and m.picking_id.address_id and m.picking_id.address_id.partner_id,
+                m.picking_id and m.picking_id.partner_id and m.picking_id.partner_id,
                 m.product_id,
                 context
             )
@@ -1908,7 +1905,7 @@ class stock_move(osv.osv):
                     'auto_picking': moves_todo[0][1][1] == 'auto',
                     'stock_journal_id': moves_todo[0][1][3],
                     'company_id': moves_todo[0][1][4] or res_company._company_default_get(cr, uid, 'stock.company', context=context),
-                    'address_id': picking.address_id.id,
+                    'partner_id': picking.partner_id.id,
                     'invoice_state': 'none',
                     'date': picking.date,
                 }
@@ -2165,7 +2162,7 @@ class stock_move(osv.osv):
                 context = {}
             currency_ctx = dict(context, currency_id = move.company_id.currency_id.id)
             amount_unit = move.product_id.price_get('standard_price', context=currency_ctx)[move.product_id.id]
-            reference_amount = amount_unit * qty or 1.0
+            reference_amount = amount_unit * qty
 
         return reference_amount, reference_currency_id
 
@@ -2264,7 +2261,7 @@ class stock_move(osv.osv):
         processing of the given stock move.
         """
         # prepare default values considering that the destination accounts have the reference_currency_id as their main currency
-        partner_id = (move.picking_id.address_id and move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id) or False
+        partner_id = (move.picking_id.partner_id and move.picking_id.partner_id.id and move.picking_id.partner_id.id) or False
         debit_line_vals = {
                     'name': move.name,
                     'product_id': move.product_id and move.product_id.id or False,
@@ -2496,7 +2493,7 @@ class stock_move(osv.osv):
     def do_partial(self, cr, uid, ids, partial_datas, context=None):
         """ Makes partial pickings and moves done.
         @param partial_datas: Dictionary containing details of partial picking
-                          like partner_id, address_id, delivery_date, delivery
+                          like partner_id, delivery_date, delivery
                           moves with product_id, product_qty, uom
         """
         res = {}
@@ -2672,7 +2669,6 @@ class stock_inventory(osv.osv):
                 pid = line.product_id.id
                 product_context.update(uom=line.product_uom.id, date=inv.date, prodlot_id=line.prod_lot_id.id)
                 amount = location_obj._product_get(cr, uid, line.location_id.id, [pid], product_context)[pid]
-
                 change = line.product_qty - amount
                 lot_id = line.prod_lot_id.id
                 if change:
@@ -2684,6 +2680,7 @@ class stock_inventory(osv.osv):
                         'prodlot_id': lot_id,
                         'date': inv.date,
                     }
+
                     if change > 0:
                         value.update( {
                             'product_qty': change,
@@ -2775,7 +2772,7 @@ class stock_warehouse(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
-        'partner_address_id': fields.many2one('res.partner.address', 'Owner Address'),
+        'partner_id': fields.many2one('res.partner', 'Owner Address'),
         'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True, domain=[('usage','<>','view')]),
         'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','=','internal')]),
         'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True, domain=[('usage','<>','view')]),
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 3940804eb5c..ec0860f62c7 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -5,7 +5,7 @@
         <record id="base.user_demo" model="res.users">
             <field eval="[(4, ref('group_stock_user'))]" name="groups_id"/>
         </record>
-    
+
         <!--
     Resource: stock.location
     -->
@@ -42,7 +42,7 @@
             <field name="name">Shelf 1</field>
             <field name="location_id" ref="stock_location_stock"/>
         </record>
-        
+
 
         <!--
     Resource: stock.inventory
@@ -183,13 +183,14 @@
         <record id="res_partner_tinyshop0" model="res.partner">
             <field eval="0" name="customer"/>
             <field eval="0" name="supplier"/>
+            <field name="is_company">1</field>
             <field eval="1" name="active"/>
             <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
-            <field name="address" eval="[]"/>
         </record>
-        <record id="res_partner_address_fabien0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
-            <field name="partner_id" ref="res_partner_tinyshop0"/>
+        <record id="res_partner_address_fabien0" model="res.partner">
+            <field eval="&quot;&quot;&quot;Felix&quot;&quot;&quot;" name="name"/>
+            <field name="parent_id" ref="res_partner_tinyshop0"/>
+            <field name="use_parent_address" eval="1"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_company_shop0" model="res.company">
@@ -202,12 +203,13 @@
             <field eval="1" name="customer"/>
             <field eval="0" name="supplier"/>
             <field eval="1" name="active"/>
+            <field name="is_company">1</field>
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
-            <field name="address" eval="[]"/>
         </record>
-        <record id="res_partner_address_eric0" model="res.partner.address">
-            <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
-            <field name="partner_id" ref="res_partner_tinyshop1"/>
+        <record id="res_partner_address_eric0" model="res.partner">
+            <field eval="&quot;&quot;&quot;Edwin&quot;&quot;&quot;" name="name"/>
+            <field name="parent_id" ref="res_partner_tinyshop1"/>
+            <field name="use_parent_address" eval="1"/>
             <field eval="1" name="active"/>
         </record>
         <record id="res_company_tinyshop0" model="res.company">
@@ -217,7 +219,7 @@
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="stock_location_shop0" model="stock.location">
-            <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
+            <field model="res.partner" name="partner_id" search="[('name','=','Fabien')]"/>
             <field name="location_id" ref="stock.stock_location_locations"/>
             <field name="company_id" ref="res_company_shop0"/>
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
@@ -227,7 +229,7 @@
             <field eval="&quot;&quot;&quot;manual&quot;&quot;&quot;" name="chained_auto_packing"/>
         </record>
         <record id="stock_location_shop1" model="stock.location">
-            <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
+            <field model="res.partner" name="partner_id" search="[('name','=','Eric')]"/>
             <field name="company_id" ref="res_company_tinyshop0"/>
             <field name="location_id" ref="stock.stock_location_locations"/>
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
@@ -235,7 +237,7 @@
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="stock_location_intermediatelocation0" model="stock.location">
-            <field name="address_id" ref="base.main_address"/>
+            <field name="partner_id" ref="base.main_partner"/>
             <field name="location_id" ref="stock.stock_location_locations_partner"/>
             <field eval="&quot;&quot;&quot;procurement&quot;&quot;&quot;" name="usage"/>
             <field eval="&quot;&quot;&quot;Internal Shippings&quot;&quot;&quot;" name="name"/>
@@ -245,7 +247,7 @@
             <field name="lot_output_id" ref="stock.stock_location_output"/>
             <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
             <field name="lot_stock_id" ref="stock_location_shop0"/>
-            <field name="partner_address_id" ref="res_partner_address_fabien0"/>
+            <field name="partner_id" ref="res_partner_address_fabien0"/>
             <field name="company_id" ref="res_company_shop0"/>
             <field name="lot_input_id" ref="stock_location_shop0"/>
         </record>
@@ -253,7 +255,7 @@
             <field name="lot_output_id" ref="stock.stock_location_output"/>
             <field name="name">Shop 2</field>
             <field name="lot_stock_id" ref="stock_location_shop1"/>
-            <field name="partner_address_id" ref="res_partner_address_eric0"/>
+            <field name="partner_id" ref="res_partner_address_eric0"/>
             <field name="company_id" ref="res_company_tinyshop0"/>
             <field name="lot_input_id" ref="stock_location_shop1"/>
         </record>
diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index 4a1cb831b41..0db509e40ba 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -10,7 +10,7 @@
  !record {model: stock.location, id: location_refrigerator_small}:
     name: Small Refrigerator
     usage: internal
-    location_id: location_refrigerator   
+    location_id: location_refrigerator
 -
  !record {model: stock.location, id: location_opening}:
     name: opening
@@ -75,7 +75,7 @@
     product_qty: 40.0
     prod_lot_id: lot_icecream_1
     location_id: location_refrigerator
-        
+
 -
  !record {model: stock.picking, id: outgoing_shipment}:
     type: out
@@ -92,7 +92,7 @@
  !record {model: stock.picking, id: incomming_shipment}:
     type: in
     invoice_state: 2binvoiced
-    address_id: base.res_partner_address_9
+    partner_id: base.res_partner_address_9
     location_dest_id: location_refrigerator
 -
  !record {model: stock.move, id: incomming_shipment_icecream}:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 76e1c1a81e9..1d8f7e04fe4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -6,33 +6,33 @@
                   groups="group_stock_manager,group_stock_user" sequence="5"
                   web_icon="images/warehouse.png"
                   web_icon_hover="images/warehouse-hover.png"/>
-        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
-        <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2" groups="base.group_extended"/>
+        <menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
+        <menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2" groups="base.group_extended"/>
         <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
         <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
            parent="stock.menu_stock_product" sequence="0"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
-        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1"/>
+        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="40" groups="base.group_no_one"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
         <menuitem
             id="menu_product_in_config_stock" name="Products"
-            parent="stock.menu_stock_configuration" sequence="2"/>
+            parent="stock.menu_stock_configuration" sequence="45" groups="base.group_no_one"/>
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_stock"
-            parent="stock.menu_product_in_config_stock" sequence="0"/>
+            parent="stock.menu_product_in_config_stock" sequence="0" />
         <menuitem
             action="product.product_ul_form_action" groups="product.group_stock_packaging"
             id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
          <menuitem
             id="menu_stock_unit_measure_stock" name="Units of Measure"
-            parent="stock.menu_product_in_config_stock"  sequence="2" groups="product.group_uom"/>
+            parent="stock.menu_product_in_config_stock"  sequence="35" groups="product.group_uom"/>
          <menuitem
              action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
-             parent="stock.menu_stock_unit_measure_stock" sequence="0"/>
+             parent="menu_stock_configuration" sequence="30"/>
          <menuitem
               action="product.product_uom_form_action" id="menu_stock_uom_form_action"
-              parent="stock.menu_stock_unit_measure_stock" sequence="1"/>
+              parent="menu_stock_configuration" sequence="35"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
@@ -250,7 +250,7 @@
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
-            groups="stock.group_tracking_lot"
+            groups="product.group_stock_packaging"
             sequence="6"
             parent="menu_traceability"/>
 
@@ -343,7 +343,6 @@
                                 <tree  string="Stock Moves">
                                     <field name="picking_id" string="Reference"/>
                                     <field name="origin"/>
-                                    <field name="partner_id"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM" groups="product.group_uom"/>
@@ -406,7 +405,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_production_lot_tree"/>
             <field name="search_view_id" ref="search_product_lot_filter" />
-            <field name="context">{"search_default_available":1}</field>
+            <field name="context">{}</field>
             <field name="help">This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers.</field>
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form"
@@ -432,8 +431,8 @@
                     <field name="picking_id"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
-                    <field name="create_date"/>
-                    <field name="date" string="Date"/>
+                    <field name="create_date" groups="base.group_no_one"/>
+                    <field name="date" string="Date" groups="base.group_no_one"/>
                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
@@ -456,8 +455,8 @@
                     <field name="picking_id"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
-                    <field name="create_date" />
-                    <field name="date" string="Date"/>
+                    <field name="create_date" groups="base.group_no_one"/>
+                    <field name="date" string="Date" groups="base.group_no_one"/>
                      <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
@@ -510,7 +509,7 @@
                     </group>
                     <group col="4" colspan="2">
                         <separator string="Additional Information" colspan="4"/>
-                        <field name="address_id" context="{'contact_display':'partner'}" colspan="4"/>
+                        <field name="partner_id" colspan="4"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="4"/>
                         <field name="icon" groups="base.group_extended" colspan="4"/>
                         <field name="scrap_location" groups="base.group_extended"/>
@@ -586,7 +585,8 @@
             <field name="context">{'search_default_in_location':1}</field>
             <field name="help">Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations.</field>
         </record>
-        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config"/>
+        <menuitem action="action_location_form" id="menu_action_location_form" groups="stock.group_locations"
+            parent="menu_stock_configuration" sequence="5"/>
 
         <record id="view_location_tree" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
@@ -625,7 +625,7 @@
                     <field name="lot_output_id"/>
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     <newline/>
-                    <field name="partner_address_id" context="{'contact_display':'partner'}"/>
+                    <field name="partner_id"/>
                 </form>
             </field>
         </record>
@@ -639,7 +639,7 @@
                     <field name="lot_input_id"/>
                     <field name="lot_stock_id"/>
                     <field name="lot_output_id"/>
-                    <field name="partner_address_id" context="{'contact_display':'partner'}"/>
+                    <field name="partner_id"/>
                 </tree>
             </field>
         </record>
@@ -651,7 +651,8 @@
             <field name="view_id" ref="view_warehouse_tree"/>
             <field name="help">Create and manage your warehouses and assign them a location from here</field>
         </record>
-        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config"/>
+        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" groups="stock.group_locations"
+            parent="menu_stock_configuration" sequence="1"/>
 
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
@@ -659,10 +660,10 @@
             <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
-                <calendar string="Calendar View" date_start="min_date" date_stop="max_date" color="address_id">
+                <calendar string="Calendar View" date_start="min_date" date_stop="max_date" color="partner_id">
                     <field name="origin"/>
                     <field name="type"/>
-                    <field name="address_id"/>
+                    <field name="partner_id"/>
                 </calendar>
             </field>
         </record>
@@ -673,7 +674,6 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="partner_id" invisible="True"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -696,7 +696,7 @@
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
                             <field name="origin"/>
-                            <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" colspan="4"/>
+                            <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
                             <field name="invoice_state" string="Invoice Control" groups="base.group_extended"/>
                             <field name="backorder_id" readonly="1" groups="base.group_extended"/>
                         </group>
@@ -708,7 +708,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Products">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': address_id}">
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': partner_id}">
                                 <tree colors="grey:scrapped == True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -745,7 +745,7 @@
                                     <group colspan="2" col="4">
                                         <separator colspan="4" string="Move Information"/>
                                         <field name="name" invisible="1" colspan="4"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4"/>
+                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/>
                                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
                                         <button name="%(stock.move_scrap)d"
                                                 string="Scrap" type="action" groups="base.group_extended"
@@ -838,12 +838,11 @@
                         <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Internal Pickings to invoice"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="address_id"/>
+                        <field name="partner_id"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
@@ -867,7 +866,6 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
-                    <field name="partner_id"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
@@ -889,7 +887,7 @@
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
                             <field name="origin" readonly="1"/>
-                            <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" colspan="4"/>
+                            <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4"/>
                             <field name="invoice_state"/>
                             <field name="backorder_id" readonly="1" groups="base.group_extended"/>
                         </group>
@@ -901,7 +899,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Products">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_out_id': address_id, 'picking_type': type}" >
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_out_id': partner_id, 'picking_type': type}" >
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -936,7 +934,7 @@
                                     <group colspan="2" col="4">
                                         <separator colspan="4" string="Move Information"/>
                                         <field name="name" invisible="1" colspan="4" />
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4" />
+                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4" />
                                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3" />
                                         <button name="%(stock.move_scrap)d"
                                                 string="Scrap" type="action"
@@ -1030,14 +1028,12 @@
                         <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="partner_id" />
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
@@ -1057,7 +1053,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_confirmed': 1, 'search_default_available': 1}</field>
+            <field name="context">{'default_type': 'out', 'contact_display': 'partner_address'}</field>
             <field name="search_view_id" ref="view_picking_out_search"/>
             <field name="help">This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules.</field>
         </record>
@@ -1087,7 +1083,6 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'done';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="partner_id" />
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -1110,7 +1105,7 @@
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
                             <field name="origin"/>
-                            <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" domain="[('partner_id','&lt;&gt;',False)]" colspan="4"/>
+                            <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4"/>
                             <field name="invoice_state" string="Invoice Control"/>
                             <field name="backorder_id" readonly="1" groups="base.group_extended"/>
                         </group>
@@ -1122,7 +1117,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': address_id, 'picking_type': type}" >
+                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': partner_id, 'picking_type': type}" >
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
                                     <field name="product_id" />
                                     <field name="product_qty" />
@@ -1156,7 +1151,7 @@
                                     <group colspan="2" col="4">
                                         <separator colspan="4" string="Move Information"/>
                                         <field name="name" invisible="1" colspan="4"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4"/>
+                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/>
                                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
                                         <button name="%(stock.move_scrap)d"
                                                 string="Scrap" type="action" groups="base.group_extended"
@@ -1246,14 +1241,12 @@
                         <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="partner_id"/>
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
@@ -1274,7 +1267,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
-            <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
+            <field name="context">{'contact_display': 'partner_address'}</field>
             <field name="search_view_id" ref="view_picking_in_search"/>
             <field name="help">The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially.</field>
         </record>
@@ -1366,8 +1359,7 @@
                     <field name="name"/>
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
-                    <field name="create_date" invisible="1"/>
-                    <field name="partner_id"/>
+                    <field name="create_date" invisible="1" groups="base.group_no_one"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" string="UoM" groups="product.group_uom"/>
@@ -1393,7 +1385,7 @@
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
-                    <field name="date"/>
+                    <field name="date" groups="base.group_no_one"/>
                     <field name="date_expected"/>
                     <field name="state"/>
                     <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
@@ -1421,7 +1413,7 @@
                         <newline/>
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
-                        <field name="address_id" context="{'contact_display':'partner'}"/>
+                        <field name="partner_id" context="{'contact_display':'partner'}"/>
 
                     </group>
                     <group colspan="2" col="2">
@@ -1439,8 +1431,8 @@
 
                     <group colspan="2" col="2">
                         <separator string="Dates" colspan="2" />
-                        <field name="create_date" groups="base.group_extended"/>
-                        <field name="date" groups="base.group_extended"/>
+                        <field name="create_date" groups="base.group_no_one" />
+                        <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
 
@@ -1489,8 +1481,8 @@
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
-                        <field name="address_id" string="Partner" context="{'contact_display':'partner'}" filter_domain="[('picking_id.address_id','ilike',self)]"/>
-                        <field name="date"/>
+                        <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
+                        <field name="date" groups="base.group_no_one"/>
                         <field name="origin"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1506,7 +1498,7 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock_effects-object-colorize" string="State" domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
+                        <filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                         <filter string="Expected" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
@@ -1520,7 +1512,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_move_search"/>
-            <field name="context">{'search_default_ready':1}</field>
+            <field name="context">{}</field>
             <field name="help">This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product.</field>
         </record>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
@@ -1541,7 +1533,6 @@
                 <tree colors="grey:state == 'cancel'" string="Moves">
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
-                    <field name="partner_id" string="Partner"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
                     <field name="product_uom" string="UoM" groups="product.group_uom"/>
@@ -1564,7 +1555,7 @@
                         groups="product.group_stock_packaging"
                         icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
-                    <field name="date"/>
+                    <field name="date" groups="base.group_no_one"/>
                     <field name="state"/>
                     <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                     <button name="action_done" string="Process" type="object" states="confirmed,assigned" icon="gtk-go-forward"/>
@@ -1580,11 +1571,10 @@
             <field name="arch" type="xml">
                 <tree string="Moves">
                     <field name="picking_id" string="Reference"/>
-                    <field name="partner_id" string="Partner"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
                     <field name="product_uom" string="UoM" groups="product.group_uom"/>
-                    <field name="date"/>
+                    <field name="date" groups="base.group_no_one" />
                     <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
@@ -1609,7 +1599,7 @@
                         <newline/>
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
-                        <field name="address_id" context="{'contact_display':'partner'}"/>
+                        <field name="partner_id"/>
 
                     </group>
                     <group colspan="2" col="2">
@@ -1627,8 +1617,8 @@
 
                     <group colspan="2" col="2">
                         <separator string="Dates" colspan="2" />
-                        <field name="create_date" groups="base.group_extended"/>
-                        <field name="date" groups="base.group_extended"/>
+                        <field name="create_date" groups="base.group_no_one" />
+                        <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
 
@@ -1676,19 +1666,17 @@
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
-                        <field name="partner_id" string="Partner"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
+                        <separator orientation="vertical" groups="base.group_no_one"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
@@ -1709,19 +1697,17 @@
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
-                        <field name="partner_id" string="Partner"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
+                        <separator orientation="vertical" groups="base.group_no_one"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
@@ -1735,7 +1721,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'search_default_receive\':1, \'search_default_available\':1, \'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
+            <field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
             <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
             <field name="help">Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
         </record>
@@ -1787,7 +1773,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_incoterms_tree" id="menu_action_incoterm_open" parent="menu_warehouse_config" sequence="7"/>
+        <menuitem action="action_incoterms_tree" id="menu_action_incoterm_open" parent="menu_warehouse_config" sequence="1"/>
 
         <act_window
             context="{'location': active_id}"
@@ -1870,7 +1856,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'search_default_receive\':1,\'search_default_available\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
+            <field name="context" eval="'{\'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
             <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
             <field name="help">You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field).</field>
         </record>
@@ -1935,8 +1921,7 @@
         <menuitem
             action="action_stock_journal_form"
             id="menu_action_stock_journal_form"
-            groups="base.group_extended"
-            parent="menu_warehouse_config" />
+            parent="menu_warehouse_config" sequence="1"/>
 
         <record model="ir.actions.todo.category" id="category_stock_management_config">
             <field name="name">Stock Management</field>
diff --git a/addons/stock_invoice_directly/i18n/lv.po b/addons/stock_invoice_directly/i18n/lv.po
new file mode 100644
index 00000000000..208548be077
--- /dev/null
+++ b/addons/stock_invoice_directly/i18n/lv.po
@@ -0,0 +1,23 @@
+# Latvian 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:37+0000\n"
+"PO-Revision-Date: 2012-03-21 14:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@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-03-22 04:57+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index f07e2dbfa31..b0cd831ec8d 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -5,7 +5,7 @@
   I create an Outgoing Picking order.
 -
   !record {model: stock.picking, id: stock_picking_out0}:
-    address_id: base.res_partner_address_3000
+    partner_id: base.res_partner_address_3000
     invoice_state: 2binvoiced
     move_lines:
       - company_id: base.main_company
@@ -55,7 +55,7 @@
   !python {model: account.invoice}: |
     picking_obj = self.pool.get('stock.picking')
     picking = picking_obj.browse(cr, uid, [ref('stock_picking_out0')])
-    partner = picking[0].address_id.partner_id.id
+    partner = picking[0].partner_id.id
     inv_ids = self.search(cr, uid, [('type','=','out_invoice'),('partner_id','=',partner)])
     assert inv_ids, 'No Invoice is generated!'
 
diff --git a/addons/stock_location/i18n/lv.po b/addons/stock_location/i18n/lv.po
new file mode 100644
index 00000000000..979ef65f00d
--- /dev/null
+++ b/addons/stock_location/i18n/lv.po
@@ -0,0 +1,397 @@
+# Latvian 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:37+0000\n"
+"PO-Revision-Date: 2012-03-21 14:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@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-03-22 04:57+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Sending Goods"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled Paths"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location_path
+msgid "Pushed Flows"
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Parameters"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_src_id:0
+#: field:stock.location.path,location_from_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,cancel_cascade:0
+msgid "Allow you to cancel moves related to the product pull flow"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_pulled_flow
+#: field:product.product,flow_pull_ids:0
+msgid "Pulled Flows"
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,location_src_id:0
+msgid "Location used by Destination Location to supply"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Internal"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:98
+#, python-format
+msgid ""
+"Pulled procurement coming from original location %s, pull rule %s, via "
+"original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location
+msgid "Location"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,invoice_state:0
+#: field:stock.location.path,invoice_state:0
+msgid "Invoice Status"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,auto:0
+msgid ""
+"This is used to define paths the product has to follow within the location "
+"tree.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Conditions"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_pack_zone
+msgid "Pack Zone"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_b
+msgid "Gate B"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_a
+msgid "Gate A"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Buy"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pushed flows"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_dispatch_zone
+msgid "Dispatch Zone"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled flows"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Logistics Flows"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.move,cancel_cascade:0
+msgid "If checked, when this move is cancelled, cancel the linked move too"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Produce"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Order"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,partner_address_id:0
+msgid "Partner Address"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,delay:0
+msgid "Number of days to do this transition"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,company_id:0
+msgid "Is used to know to which company belong packings and moves"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_location
+#: help:product.product,path_ids:0
+msgid ""
+"These rules set the right path of the product in the whole location tree."
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_product
+#: field:product.pulled.flow,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,procure_method:0
+msgid "Procure Method"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,picking_type:0
+#: field:stock.location.path,picking_type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,location_id:0
+msgid "Is the destination location that needs supplying"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,product_id:0
+msgid "Products"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:118
+#, python-format
+msgid "Pulled from another location via procurement %d"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.stock_location_qualitytest0
+msgid "Quality Control"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,delay:0
+msgid "Delay (days)"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:67
+#, python-format
+msgid ""
+"Picking for pulled procurement coming from original location %s, pull rule "
+"%s, via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: field:product.product,path_ids:0
+msgid "Pushed Flow"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:89
+#, python-format
+msgid ""
+"Move for pulled procurement coming from original location %s, pull rule %s, "
+"via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_id:0
+#: field:stock.location.path,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,auto:0
+#: selection:stock.location.path,auto:0
+msgid "Automatic Move"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Action Type"
+msgstr ""
+
+#. module: stock_location
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,picking_type:0
+#: help:stock.location.path,picking_type:0
+msgid ""
+"Depending on the company, choose whatever you want to receive or send "
+"products"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_order
+msgid "Order Processing"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,name:0
+msgid "Operation"
+msgstr ""
+
+#. module: stock_location
+#: view:stock.location.path:0
+msgid "Location Paths"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,cancel_cascade:0
+#: field:stock.move,cancel_cascade:0
+msgid "Cancel Cascade"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Invoiced"
+msgstr ""
diff --git a/addons/stock_location/procurement_pull.py b/addons/stock_location/procurement_pull.py
index 0846fe067eb..33168a53e20 100644
--- a/addons/stock_location/procurement_pull.py
+++ b/addons/stock_location/procurement_pull.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,7 +14,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -63,7 +63,7 @@ class procurement_order(osv.osv):
                 'type': line.picking_type,
                 'stock_journal_id': line.journal_id and line.journal_id.id or False,
                 'move_type': 'one',
-                'address_id': line.partner_address_id.id,
+                'partner_id': line.partner_address_id.id,
                 'note': _('Picking for pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)') % (proc.location_id.name, line.name, proc.name, proc.id),
                 'invoice_state': line.invoice_state,
             })
@@ -79,7 +79,7 @@ class procurement_order(osv.osv):
                         or proc.product_qty,
                 'product_uos': (proc.product_uos and proc.product_uos.id)\
                         or proc.product_uom.id,
-                'address_id': line.partner_address_id.id,
+                'partner_id': line.partner_address_id.id,
                 'location_id': line.location_src_id.id,
                 'location_dest_id': line.location_id.id,
                 'move_dest_id': proc.move_id and proc.move_id.id or False, # to verif, about history ?
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 16bf0501f36..de4e2e7f561 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -68,7 +68,7 @@ class product_pulled_flow(osv.osv):
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True),
         'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company belong packings and moves"),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Address'),
+        'partner_address_id': fields.many2one('res.partner', 'Partner Address'),
         'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
         'product_id':fields.many2one('product.product','Product'),
         'invoice_state': fields.selection([
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 01f711839d4..028c71bd188 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -44,7 +44,7 @@
             <field name="product_id" ref="product.product_product_cpu1"/>
             <field name="location_src_id" ref="stock.stock_location_intermediatelocation0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>
-            <field name="partner_address_id" ref="base.main_address"/>
+            <field name="partner_address_id" ref="base.main_partner"/>
             <field name="invoice_state">none</field>
             <field name="company_id" ref="stock.res_company_shop0"/>
             <field name="type_proc">move</field>
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index c5e134181f7..3660e9c8ac6 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -106,11 +106,10 @@
   I create a Supplier.
 -
   !record {model: res.partner, id: res_partner_shawtrust0}:
-    address:
-      - country_id: base.in
-      - street: St James House, Vicar Lane, Sheffield
+    name: Shaw Trust
     lang: en_US
-    name: 'Shaw Trust '
+    country_id: base.in
+    street: St James House, Vicar Lane, Sheffiel
     property_account_payable: account_account_payable0
     property_account_receivable: account_account_receivable0
 -
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
index b6a938e99e5..efd2daaf272 100644
--- a/addons/stock_location/test/stock_location_push_flow.yml
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -11,19 +11,20 @@
   I create Supplier.
 -
   !record {model: res.partner, id: res_partner_microlinktechnologies0}:
-    address:
-      - street: Kailash Vaibhav, Parksite
+    street: Kailash Vaibhav, Parksite
     name: Micro Link Technologies
     property_account_payable: account_account_payable0
     property_account_receivable: account_account_receivable0
     supplier: true
+    is_company: true
 
 -
   I create Supplier address.
 -
-  !record {model: res.partner.address, id: res_partner_address_0}:
+  !record {model: res.partner, id: res_partner_address_0}:
+    name: Micro Link Technologies
     country_id: base.in
-    partner_id: res_partner_microlinktechnologies0
+    parent_id: res_partner_microlinktechnologies0
     street: Ash House, Ash Road
     title: base.res_partner_title_miss
 
@@ -64,7 +65,7 @@
   In order to test pushed flow .I buy the product from Micro Link Technologies supplier. I create a Picking.
 -
    !record {model: stock.picking , id: stock_picking_in0}:
-    address_id: res_partner_address_0
+    partner_id: res_partner_address_0
     company_id: base.main_company
     invoice_state: none
     move_lines:
@@ -104,13 +105,12 @@
 -
   !python {model: stock.picking }: |
    import time
-   picking_id = self.search(cr, uid, [('address_id.partner_id','=',ref('res_partner_microlinktechnologies0')),('type','=','in')])
+   picking_id = self.search(cr, uid, [('partner_id','=',ref('res_partner_microlinktechnologies0')),('type','=','in')])
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       move =pick.move_lines[0]
       partial_datas = {
-           'partner_id':pick.address_id.partner_id.id,
-            'address_id': pick.address_id.id,
+           'partner_id':pick.partner_id,
             'delivery_date' : time.strftime('%Y-%m-%d'),
            }
       partial_datas['move%s'%(move.id)]= {
diff --git a/addons/stock_no_autopicking/i18n/lv.po b/addons/stock_no_autopicking/i18n/lv.po
new file mode 100644
index 00000000000..15c44a3c33b
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/lv.po
@@ -0,0 +1,53 @@
+# Latvian 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:37+0000\n"
+"PO-Revision-Date: 2012-03-21 14:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@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-03-22 04:57+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr ""
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
diff --git a/addons/stock_planning/i18n/lv.po b/addons/stock_planning/i18n/lv.po
new file mode 100644
index 00000000000..d864ff071f6
--- /dev/null
+++ b/addons/stock_planning/i18n/lv.po
@@ -0,0 +1,1175 @@
+# Latvian 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:37+0000\n"
+"PO-Revision-Date: 2012-03-21 14:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@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-03-22 04:57+0000\n"
+"X-Generator: Launchpad (build 14981)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#: code:addons/stock_planning/stock_planning.py:670
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
+msgid ""
+"This wizard helps with the creation of stock planning periods. These periods "
+"are independent of financial periods. If you need periods other than day-, "
+"week- or month-based, you may also add then manually."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Check to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "No products in selected category !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#, python-format
+msgid ""
+" Procurement created by MPS for user: %s   Creation Date: %s                 "
+"                        \n"
+" For period: %s                                         \n"
+" according to state:                                         \n"
+" Warehouse Forecast: %s                                         \n"
+" Initial Stock: %s                                         \n"
+" Planned Out: %s    Planned In: %s                                         \n"
+" Already Out: %s    Already In: %s                                         \n"
+" Confirmed Out: %s    Confirmed In: %s                                       "
+"  \n"
+" Planned Out Before: %s    Confirmed In Before: %s                           "
+"              \n"
+" Expected Out: %s    Incoming Left: %s                                       "
+"  \n"
+" Stock Simulation: %s    Minimum stock: %s"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#: code:addons/stock_planning/stock_planning.py:670
+#: code:addons/stock_planning/stock_planning.py:672
+#: code:addons/stock_planning/stock_planning.py:674
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:146
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procurement history"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+msgid ""
+"Unit of Measure used to show the quantities of stock calculation.You can use "
+"units from default category or from second category (UoS category)."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
+msgid ""
+"Stock periods are used for stock planning. Stock periods are independent of "
+"account periods. You can use wizard for creating periods and review them "
+"here."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:674
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:146
+#, python-format
+msgid "Cannot delete a validated sales forecast!"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Company Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Forecast Quantity"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quantities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:724
+#, python-format
+msgid "%s Pick List %s (%s,  %s) %s %s \n"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
+msgid ""
+"This wizard helps create MPS planning lines for a given selected period and "
+"warehouse, so you don't have to create them one by one. The wizard doesn't "
+"duplicate lines if they already exist for this selection."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales history"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecast Product quantity."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:632
+#: code:addons/stock_planning/stock_planning.py:678
+#: code:addons/stock_planning/stock_planning.py:702
+#, python-format
+msgid "MPS(%s) %s"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
+msgid ""
+"This quantity sales forecast is an indication for Stock Planner to make "
+"procurement manually or to complement automatic procurement. You can use "
+"manual procurement with this forecast when some periods are exceptional for "
+"usual minimum stock rules."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
+msgid ""
+"The Master Procurement Schedule can be the main driver for warehouse "
+"replenishment, or can complement the automatic MRP scheduling (minimum stock "
+"rules, etc.).\n"
+"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
+"quantities of a given product for a given Stock Period in a given Warehouse, "
+"based on the current and future stock levels,\n"
+"as well as the planned stock moves. The forecast quantities can be altered "
+"manually, and when satisfied with resulting (simulated) Stock quantity, you "
+"can trigger the procurement of what is missing to reach your desired "
+"quantities"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid ""
+"Pick created from MPS by user: %s   Creation Date: %s                        "
+"             \n"
+"For period: %s   according to state:                                     \n"
+" Warehouse Forecast: %s                                     \n"
+" Initial Stock: %s                                     \n"
+" Planned Out: %s  Planned In: %s                                     \n"
+" Already Out: %s  Already In: %s                                     \n"
+" Confirmed Out: %s   Confirmed In: %s                                     \n"
+" Planned Out Before: %s   Confirmed In Before: %s                            "
+"         \n"
+" Expected Out: %s   Incoming Left: %s                                     \n"
+" Stock Simulation: %s   Minimum stock: %s "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warehouse' with Supply Warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warehouse'."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:661
+#, python-format
+msgid "%s Procurement (%s,  %s) %s %s \n"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:672
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:631
+#, python-format
+msgid "MPS planning for %s"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_team_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period besides Confirmed Out. As a "
+"difference between Planned Out and Confirmed Out. For current period Already "
+"Out is also calculated"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
+msgid ""
+"This wizard helps create many forecast lines at once. After creating them "
+"you only have to fill in the forecast quantities. The wizard doesn't "
+"duplicate the line when another one exist for the same selection."
+msgstr ""
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 3cbee4d53d8..3ce0184eb00 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -69,9 +69,9 @@
 
         <menuitem
             id="menu_stock_period"
-            parent="menu_stock_period_main"
+            parent="stock.menu_stock_configuration"
             action="action_stock_period_form"
-            sequence = "10"/>
+            sequence = "25"/>
 
         <record id="view_stock_sale_forecast_form" model="ir.ui.view">
             <field name="name">stock.sale.forecast.form</field>
@@ -184,7 +184,7 @@
         <!-- Forecast section -->
 
         <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts"
-                parent="base.menu_base_partner" sequence="6" groups="base.group_extended"/>
+                parent="base.menu_base_partner" sequence="5" groups="base.group_extended"/>
 
         <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
             <field name="name">stock.sale.forecast.list.select</field>
diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml
index 8e26d690f53..2b75f5a5d94 100644
--- a/addons/stock_planning/test/stock_planning.yml
+++ b/addons/stock_planning/test/stock_planning.yml
@@ -157,7 +157,6 @@
     order_policy: manual
     partner_id: base.res_partner_desertic_hispafuentes
     partner_invoice_id: base.res_partner_address_3000
-    partner_order_id: base.res_partner_address_3000
     partner_shipping_id: base.res_partner_address_3000
     picking_policy: direct
     pricelist_id: product.list0
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index 42730dc8ace..c2658a7b5a5 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -34,8 +34,8 @@
 
         <menuitem id="menu_stock_period_creatlines"
                   name="Create Stock Periods"
-                  parent="menu_stock_period_main"
+                  parent="stock.menu_stock_configuration"
                   action="action_stock_period_createlines_form"
-                  sequence = "5"/>
+                  sequence = "20"/>
     </data>
 </openerp>
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index 35352cfa024..33ca44c38f0 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -4,5 +4,4 @@ access_subscription_subscription_user,subscription.subscription user,model_subsc
 access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1

 access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1

 access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1

-access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1

 access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1

diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index 7d665c96435..46293a97561 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 1566a32aa28..b613e223afa 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -11,7 +11,6 @@ access_survey_response_user,survey.response user,model_survey_response,base.grou
 access_survey_response_answer_user,survey.response.answer user,model_survey_response_answer,base.group_tool_user,1,1,1,1

 access_survey_history_user,survey.history.user,model_survey_history,base.group_tool_user,1,1,1,1

 access_survey_response_line_user,survey.response.line user,model_survey_response_line,base.group_tool_user,1,1,1,1

-access_survey_res_partner_address_user,survey.res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,0

 access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1

 access_survey_survey_user,survey.survey.user,model_survey,base.group_survey_user,1,1,1,1

 access_survey_page_survey_user,survey.page.survey.user,model_survey_page,base.group_survey_user,1,1,1,1

diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index c44a35e3ee9..3b0cf5844ce 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -9,9 +9,11 @@
             <field name="name">Manager</field>
             <field name="category_id" ref="base.module_category_tools"/>
             <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
         <record model="res.groups" id="base.group_survey_user">
             <field name="name">Survey / User</field>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 0f1a68145aa..4673bcd9846 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -8,7 +8,7 @@
             <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
                 id="base.menu_lunch_reporting" sequence="6"/>
-            <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
+            <menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
         <!--
             Survey
         -->
@@ -1167,14 +1167,14 @@
             <field name="view_id" ref="survey_type_tree"></field>
         </record>
 
-        <act_window 
+        <act_window
             context="{'search_default_survey_id': [active_id], 'default_survey_id': active_id}"
             id="act_survey_pages"
             name="Pages"
             res_model="survey.page"
             src_model="survey"/>
 
-        <act_window 
+        <act_window
             context="{'search_default_survey': active_id, 'default_survey': active_id}"
             id="act_survey_question"
             name="Questions"
@@ -1182,7 +1182,7 @@
             src_model="survey"/>
 
 
-        <act_window 
+        <act_window
             context="{'search_default_page_id': active_id, 'default_page_id': active_id}"
             id="act_survey_page_question"
             name="Questions"
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index d9f3ae6fe1e..c6188689fe6 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -35,7 +35,7 @@
 			<field name="target">new</field>
 		</record>
 
-        <menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
+        <menuitem name="Print Surveys" id="menu_print_survey_form" sequence="1"
             action="action_view_survey_print" parent="menu_reporting"
             groups="base.group_tool_manager" icon="STOCK_PRINT"/>
 
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index d4334ecfa9e..c1186d3291e 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -138,48 +138,47 @@ class survey_send_invitation(osv.osv_memory):
             os.remove(addons.get_module_resource('survey', 'report') + id.title +".pdf")
 
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
-            for addr in partner.address:
-                if not addr.email:
-                    skipped+= 1
-                    continue
-                user = user_ref.search(cr, uid, [('login', "=", addr.email)])
-                if user:
-                    if user[0] not in new_user:
-                        new_user.append(user[0])
-                    user = user_ref.browse(cr, uid, user[0])
-                    user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, survey_ids]]})
-                    mail = record['mail']%{'login':addr.email, 'passwd':user.password, \
-                                                'name' : addr.name}
-                    if record['send_mail_existing']:
-                        mail_message.schedule_with_attach(cr, uid, record['mail_from'], [addr.email] , \
-                                         record['mail_subject_existing'] , mail, context=context)
-                        existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, addr.email, \
-                                                                          user.password)
-                    continue
-
-                passwd= self.genpasswd()
-                out+= addr.email + ',' + passwd + '\n'
-                mail= record['mail'] % {'login' : addr.email, 'passwd' : passwd, 'name' : addr.name}
-                if record['send_mail']:
-                    ans = mail_message.schedule_with_attach(cr, uid, record['mail_from'], [addr.email], \
-                                           record['mail_subject'], mail, attachments=attachments, context=context)
-                    if ans:
-                        res_data = {'name': addr.name or 'Unknown',
-                                    'login': addr.email,
-                                    'password': passwd,
-                                    'address_id': addr.id,
-                                    'groups_id': [[6, 0, [group_id]]],
-                                    'action_id': act_id[0],
-                                    'survey_id': [[6, 0, survey_ids]]
-                                   }
-                        user = user_ref.create(cr, uid, res_data)
-                        if user not in new_user:
-                            new_user.append(user)
-                        created+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
-                                                                          addr.email, passwd)
-                    else:
-                        error+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
-                                                                        addr.email, passwd)
+            if not partner.email:
+                skipped+= 1
+                continue
+            user = user_ref.search(cr, uid, [('login', "=", partner.email)])
+            if user:
+                if user[0] not in new_user:
+                    new_user.append(user[0])
+                user = user_ref.browse(cr, uid, user[0])
+                user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, survey_ids]]})
+                mail = record['mail']%{'login':partner.email, 'passwd':user.password, \
+                                            'name' : partner.name}
+                if record['send_mail_existing']:
+                    mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email] , \
+                                     record['mail_subject_existing'] , mail, context=context)
+                    existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, partner.email, \
+                                                                      user.password)
+                continue
+
+            passwd= self.genpasswd()
+            out+= partner.email + ',' + passwd + '\n'
+            mail= record['mail'] % {'login' : partner.email, 'passwd' : passwd, 'name' : partner.name}
+            if record['send_mail']:
+                ans = mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email], \
+                                       record['mail_subject'], mail, attachments=attachments, context=context)
+                if ans:
+                    res_data = {'name': partner.name or _('Unknown'),
+                                'login': partner.email,
+                                'password': passwd,
+                                'address_id': partner.id,
+                                'groups_id': [[6, 0, [group_id]]],
+                                'action_id': act_id[0],
+                                'survey_id': [[6, 0, survey_ids]]
+                               }
+                    user = user_ref.create(cr, uid, res_data)
+                    if user not in new_user:
+                        new_user.append(user)
+                    created+= "- %s (Login: %s,  Password: %s)\n" % (partner.name or _('Unknown'),\
+                                                                      partner.email, passwd)
+                else:
+                    error+= "- %s (Login: %s,  Password: %s)\n" % (partner.name or _('Unknown'),\
+                                                                    partner.email, passwd)
 
         new_vals = {}
         new_vals.update({'invited_user_ids':[[6,0,new_user]]})
diff --git a/addons/users_ldap/users_ldap.py b/addons/users_ldap/users_ldap.py
index 1ad1b2df104..1d0c1e3acb9 100644
--- a/addons/users_ldap/users_ldap.py
+++ b/addons/users_ldap/users_ldap.py
@@ -256,8 +256,10 @@ class users(osv.osv):
                 user_id = ldap_obj.get_or_create_user(
                     cr, SUPERUSER_ID, conf, login, entry)
                 if user_id:
-                    cr.execute('UPDATE res_users SET date=now() WHERE '
-                               'login=%s', (tools.ustr(login),))
+                    cr.execute("""UPDATE res_users
+                                    SET date=now() AT TIME ZONE 'UTC'
+                                    WHERE login=%s""",
+                               (tools.ustr(login),))
                     cr.commit()
                     break
         cr.close()
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index eb8482ee1cb..f04f97d6f8a 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -57,7 +57,7 @@ class sale_order(osv.osv):
     _inherit = 'sale.order'
     def onchange_partner_id(self, cr, uid, ids, part):
         if not part:
-            return {'value':{'partner_invoice_id': False, 'partner_shipping_id':False, 'partner_order_id':False, 'payment_term' : False}}
+            return {'value':{'partner_invoice_id': False, 'partner_shipping_id':False, 'payment_term' : False}}
         warning = {}
         title = False
         message = False
@@ -117,8 +117,6 @@ class account_invoice(osv.osv):
             date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         if not partner_id:
             return {'value': {
-            'address_contact_id': False ,
-            'address_invoice_id': False,
             'account_id': False,
             'payment_term': False,
             }
@@ -154,7 +152,7 @@ class stock_picking(osv.osv):
     def onchange_partner_in(self, cr, uid, context, partner_id=None):
         if not partner_id:
             return {}
-        partner = self.pool.get('res.partner.address').browse(cr, uid, [partner_id])[0].partner_id
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         warning = {}
         title = False
         message = False
diff --git a/addons/wiki/i18n/ar.po b/addons/wiki/i18n/ar.po
index 2fa299a23eb..d19d60508b3 100644
--- a/addons/wiki/i18n/ar.po
+++ b/addons/wiki/i18n/ar.po
@@ -7,134 +7,134 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-03-19 10:19+0000\n"
+"Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-03-20 04:56+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
 msgid "Wiki Template"
-msgstr ""
+msgstr "نموذج ويكي"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki
 #: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
 msgid "Wiki Pages"
-msgstr ""
+msgstr "صفحات ويكي"
 
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "طريقة العرض"
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,create_uid:0
 msgid "Author"
-msgstr ""
+msgstr "المؤلف"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
 #: view:wiki.wiki.page.open:0
 msgid "Open Page"
-msgstr ""
+msgstr "صفحة عامة"
 
 #. module: wiki
 #: field:wiki.groups,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "قائمة"
 
 #. module: wiki
 #: field:wiki.wiki,section:0
 msgid "Section"
-msgstr ""
+msgstr "قسم"
 
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "يوضح ما اذا كانت هذه الصفحات تحتوى على جدول محتويات او لا تحتوى"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
 msgid "Wiki History"
-msgstr ""
+msgstr "تاريخ ويكي"
 
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "تحرير ثانوى"
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,text_area:0
 msgid "Content"
-msgstr ""
+msgstr "محتوى"
 
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "صفحات فرعية"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "صفحة رئيسية"
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "المشارك الاخير"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "القائمة الرئيسية"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "There is no section in this Page"
-msgstr ""
+msgstr "ليس هناك قسم فى هذه الصفحة"
 
 #. module: wiki
 #: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
 msgid "Wiki Group"
-msgstr ""
+msgstr "مجموعة ويكي"
 
 #. module: wiki
 #: field:wiki.wiki,name:0
 msgid "Title"
-msgstr ""
+msgstr "العنوان"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "إنشائ قائمة بالمعالج"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "سطور التاريخ"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr ""
+msgstr "محتوى الصفحة"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "تحذير !"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:237
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "لا يوجد تغيير فى المراجعات"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index 16bd30c151f..ca9d34ae99c 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -5,6 +5,7 @@
     <record id="base.group_document_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_knowledge_management"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     
 </data>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 32880ac2309..eeec9302004 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -115,7 +115,7 @@
                     <field name="review"/>
                     <field name="create_uid" invisible="context.get('create_uid',False)"/>
                     <field name="write_uid"/>
-                    <field name="write_date"/>
+                    <field name="write_date" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -141,7 +141,7 @@
                     </notebook>
                     <group col="2" colspan="2">
                         <separator colspan="4" string="Modification Information"/>
-                        <field name="write_date" readonly="1"/>
+                        <field name="write_date" readonly="1" groups="base.group_no_one"/>
                         <field name="minor_edit" groups="base.group_extended"/>
                         <field name="review" select="1" groups="base.group_extended"/>
                     </group>
@@ -168,7 +168,7 @@
                     <field name="tags"/>
                     <field name="section" groups="base.group_extended"/>
                     <field name="write_uid"/>
-                    <field name="write_date"/>
+                    <field name="write_date" groups="base.group_no_one"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
index a349f77404f..d9bd8de43ff 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_data.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <record model="document.directory" id="dir_sale">
             <field name="name">Sales Document</field>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="parent_id" ref="document.dir_root"/>
             <field name="ressource_id">0</field>
         </record>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
index 9fdaafd96b9..b43649af23a 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -27,13 +27,13 @@
        </record>
 
         <menuitem
-        name="Documents"
+        name="Sales Documents"
         action="action_document_form"
         id="menu_document_files"
         parent="menu_sales"/>
 
         <menuitem parent="menu_sales"
-            id="menu_action_wiki_wiki" name="FAQ"
+            id="menu_action_wiki_wiki" name="Sales FAQ"
             action="action_wiki_test" />