[MERGE] Merged from openobject-addons.

bzr revid: jra@tinyerp.com-20120627075508-kko9c9dr67695hzw

14 files changed, 62 insertions, 140 deletions

diff --git a/addons/account/account.py b/addons/account/account.py
index 6e96ce73962..caf1d68c45d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -24,11 +24,12 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 
-import netsvc
+import logging
 import pooler
 from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
+_logger = logging.getLogger(__name__)
 
 def check_cycle(self, cr, uid, ids, context=None):
     """ climbs the ``self._table.parent_id`` chains for 100 levels or
@@ -212,7 +213,6 @@ class account_account(osv.osv):
     _name = "account.account"
     _description = "Account"
     _parent_store = True
-    logger = netsvc.Logger()
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
@@ -295,8 +295,7 @@ class account_account(osv.osv):
             if aml_query.strip():
                 wheres.append(aml_query.strip())
             filters = " AND ".join(wheres)
-            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                      'Filters: %s'%filters)
+            _logger.debug('Filters: %s',(filters))
             # IN might not work ideally in case there are too many
             # children_and_consolidated, in that case join on a
             # values() e.g.:
@@ -312,8 +311,7 @@ class account_account(osv.osv):
                        " GROUP BY l.account_id")
             params = (tuple(children_and_consolidated),) + query_params
             cr.execute(request, params)
-            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                      'Status: %s'%cr.statusmessage)
+            _logger.debug('Status: %s',(cr.statusmessage))
 
             for res in cr.dictfetchall():
                 accounts[res['id']] = res
@@ -2095,9 +2093,7 @@ class account_tax(osv.osv):
         }
 
     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")
+        _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
         return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
 
     def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 68a723aa4a0..a10cba705e4 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -39,7 +39,7 @@
                     <field name="quantity"/>
                     <field name="uos_id" groups="product.group_uom"/>
                     <field name="price_unit"/>
-                    <field name="discount"/>
+                    <field name="discount" groups="sale.group_discount_per_so_line"/>
                     <field name="price_subtotal"/>
                 </tree>
             </field>
@@ -61,8 +61,8 @@
                               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)"/>
                         </div>
                         <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)"/>
-                        <field name="discount"/>
+                        <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)" groups="account.group_account_user"/>
+                        <field name="discount" groups="sale.group_discount_per_so_line"/>
                         <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
                         <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                         <field name="company_id" groups="base.group_multi_company" readonly="1"/>
@@ -98,7 +98,7 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="sequence"/>
-                        <field name="account_id"/>
+                        <field name="account_id" groups="account.group_account_user"/>
                         <field name="manual"/>
                         <field name="amount"/>
                         <field name="base" readonly="0"/>
@@ -148,7 +148,8 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
+                    <button name="invoice_open" states="proforma2" string="Validate"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
@@ -190,7 +191,7 @@
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <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.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 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)" groups="base.group_account_user"/>
                                     <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"/>
                                     <field name="quantity"/>
@@ -274,9 +275,10 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
-                    <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
+                    <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
+                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
+                    <button name="invoice_open" states="proforma2" string="Validate"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
@@ -339,7 +341,7 @@
                                     <field name="tax_line" nolabel="1">
                                         <tree editable="bottom" string="Taxes">
                                             <field name="name"/>
-                                            <field name="account_id" groups="account.group_account_invoice"/>
+                                            <field name="account_id" groups="account.group_account_user"/>
                                             <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                             <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
                                             <field invisible="True" name="base_amount"/>
@@ -357,7 +359,7 @@
                                     <field name="amount_tax"/>
                                     <field name="amount_total" class="oe_subtotal_footer_separator"/>
 
-                                    <field name="residual" style="margin-top: 10px"/>
+                                    <field name="residual" style="margin-top: 10px" groups="account.group_account_user"/>
                                     <field name="reconciled" invisible="1"/>
                                 </group>
                             </group>
@@ -482,7 +484,12 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
+            <field name="help">
+                Click here to create a new Invoice.
+                &lt;p&gt;
+                An invoice can be generated automatically from a sale order or a delivery order.
+                The invoice can be send by email.
+            </field>
         </record>
 
 
@@ -510,7 +517,12 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received.</field>
+            <field name="help">
+                Click here to create Supplier invoice.
+                &lt;p&gt;
+                You can control the invoice from your supplier according to what you purchased or received.
+                OpenERP can also generate draft invoices automatically from purchase orders or receipts.
+            </field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -523,7 +535,12 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'default_type':'out_refund', 'type':'out_refund', 'journal_type': 'sale_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field>
+            <field name="help">
+                Click here to create a new customer refund.
+                &lt;p&gt;
+                A refund is a document that credits an invoice completely or partially.
+                You can also generate refunds and reconcile them directly from the invoice form.
+            </field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -549,7 +566,12 @@
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field>
+            <field name="help">
+                Click here to create a new supplier refund.
+                &lt;p&gt;
+                Track refunds you receive from your suppliers.
+                You can also generate refunds and reconcile them directly from the invoice form.
+            </field>
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 12fd558a31f..e8899d0348a 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -555,19 +555,6 @@
             <field eval="1" name="number_increment"/>
         </record>
 
-        <!-- 
-        Sequence for analytic account 
-        -->
-        <record id="seq_type_analytic_account" model="ir.sequence.type">
-            <field name="name">Analytic account</field>
-            <field name="code">account.analytic.account</field>
-        </record>
-        <record id="seq_analytic_account" model="ir.sequence">
-            <field name="name">Analytic account sequence</field>
-            <field name="code">account.analytic.account</field>
-            <field eval="3" name="padding"/>
-            <field eval="2708" name="number_next"/>
-        </record>
 
         <!--
         Invoice requests (deprecated)
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 6cf52f58f6c..5a2b0b346c4 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -30,11 +30,11 @@ from tools.translate import _
 from osv import fields, osv
 import netsvc
 import tools
+_logger = logging.getLogger(__name__)
 
 class account_installer(osv.osv_memory):
     _name = 'account.installer'
     _inherit = 'res.config.installer'
-    __logger = logging.getLogger(_name)
 
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
@@ -149,7 +149,7 @@ class account_installer(osv.osv_memory):
             cr, uid, ids, context=context)
         chart = self.read(cr, uid, ids, ['charts'],
                           context=context)[0]['charts']
-        self.__logger.debug('Installing chart of accounts %s', chart)
+        _logger.debug('Installing chart of accounts %s', chart)
         return modules | set([chart])
 
 account_installer()
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index ec89d280774..2ca0e50e784 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -3,102 +3,85 @@
     <data noupdate="1">
         <record id="analytic_root" model="account.analytic.account">
             <field name="name" model="res.company" use="name" search="[]"/>
-            <field name="code">0</field>
         </record>
         <record id="analytic_absences" model="account.analytic.account">
             <field name="name">Leaves</field>
-            <field name="code">1</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_internal" model="account.analytic.account">
             <field name="name">Internal</field>
-            <field name="code">2</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_our_super_product" model="account.analytic.account">
             <field name="name">Our Super Product</field>
-            <field name="code">100</field>
             <field name="state">open</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_1" model="account.analytic.account">
             <field name="name">Project 1</field>
-            <field name="code">101</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_2" model="account.analytic.account">
             <field name="name">Project 2</field>
-            <field name="code">102</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_journal_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="code">4</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_in_house" model="account.analytic.account">
             <field name="name">In House</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
         <record id="analytic_online" model="account.analytic.account">
             <field name="name">Online</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_journal_trainings"/>
         </record>
         <record id="analytic_support" model="account.analytic.account">
             <field name="name">Support</field>
-            <field name="code">support</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_partners" model="account.analytic.account">
             <field name="name">Partners</field>
-            <field name="code">partners</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_customers" model="account.analytic.account">
             <field name="name">Customers</field>
-            <field name="code">customers</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_support_internal" model="account.analytic.account">
             <field name="name">Internal</field>
-            <field name="code">3</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_support"/>
         </record>
         <record id="analytic_integration" model="account.analytic.account">
             <field name="name">Integration</field>
-            <field name="code">integration</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_consultancy" model="account.analytic.account">
             <field name="name">Consultancy</field>
-            <field name="code">4</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_super_product_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="code">5</field>
-            <field name="type">normal</field>
+            <field name="type">contract</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
         <record id="analytic_seagate_p1" model="account.analytic.account">
             <field name="name">Seagate P1</field>
-            <field name="code">1</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="state">open</field>
@@ -106,7 +89,6 @@
         </record>
         <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="state">open</field>
@@ -114,14 +96,12 @@
         </record>
         <record id="analytic_magasin_bml_1" model="account.analytic.account">
             <field name="name">Magasin BML 1</field>
-            <field name="code">3</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_15"/>
         </record>
         <record id="analytic_integration_c2c" model="account.analytic.account">
             <field name="name">CampToCamp</field>
-            <field name="code">7</field>
             <field name="type">normal</field>
             <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
             <field eval="time.strftime('%Y-12-31')" name="date"/>
@@ -131,28 +111,24 @@
         </record>
         <record id="analytic_agrolait" model="account.analytic.account">
             <field name="name">Agrolait</field>
-            <field name="code">3</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
         </record>
         <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
-            <field name="code">4</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
         </record>
         <record id="analytic_distripc" model="account.analytic.account">
             <field name="name">DistriPC</field>
-            <field name="code">7</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
         </record>
         <record id="analytic_sednacom" model="account.analytic.account">
             <field name="name">Sednacom</field>
-            <field name="code">2</field>
             <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
             <field eval="time.strftime('%Y-05-08')" name="date"/>
             <field name="parent_id" ref="analytic_partners"/>
@@ -162,7 +138,6 @@
         </record>
         <record id="analytic_thymbra" model="account.analytic.account">
             <field name="name">Thymbra</field>
-            <field name="code">3</field>
             <field eval="time.strftime('%Y-02-01')" name="date_start"/>
             <field eval="time.strftime('%Y-07-01')" name="date"/>
             <field name="type">normal</field>
@@ -172,7 +147,6 @@
         </record>
         <record id="analytic_leclerc" model="account.analytic.account">
             <field name="name">Leclerc</field>
-            <field name="code">10</field>
             <field eval="time.strftime('%Y-04-24')" name="date_start"/>
             <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
             <field name="type">normal</field>
@@ -181,7 +155,6 @@
         </record>
         <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
             <field name="name">Desertic - Hispafuentes</field>
-            <field name="code">12</field>
             <field eval="time.strftime('%Y-02-01')" name="date_start"/>
             <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
             <field name="type">normal</field>
@@ -190,14 +163,12 @@
         </record>
         <record id="analytic_tiny_at_work" model="account.analytic.account">
             <field name="name">OpenERP SA AT Work</field>
-            <field name="code">15</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
         </record>
         <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="name">Camp to Camp</field>
-            <field name="code">21</field>
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
             <field name="type">normal</field>
@@ -207,67 +178,56 @@
         </record>
         <record id="analytic_project_2_support" model="account.analytic.account">
             <field name="name">Support</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_2"/>
         </record>
         <record id="analytic_project_2_development" model="account.analytic.account">
             <field name="name">Development</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_2"/>
         </record>
         <record id="analytic_project_1_trainings" model="account.analytic.account">
             <field name="name">Training</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_project_1_development" model="account.analytic.account">
             <field name="name">Development</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_administratif" model="account.analytic.account">
             <field name="name">Administrative</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_commercial_marketing" model="account.analytic.account">
             <field name="name">Commercial &amp; Marketing</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_our_super_product_development" model="account.analytic.account">
             <field name="name">Our Super Product Development</field>
-            <field name="code">3</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>
         <record id="analytic_stable" model="account.analytic.account">
             <field name="name">Stable</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
         <record id="analytic_trunk" model="account.analytic.account">
             <field name="name">Trunk</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_our_super_product_development"/>
         </record>
         <record id="analytic_paid" model="account.analytic.account">
             <field name="name">Paid</field>
-            <field name="code">1</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_absences"/>
         </record>
         <record id="analytic_unpaid" model="account.analytic.account">
             <field name="name">Unpaid</field>
-            <field name="code">2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_absences"/>
         </record>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 2132eecb463..7658ab111d9 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -19,6 +19,7 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="type" invisible="1"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -59,7 +60,7 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="code"/>
                     <field name="debit"/>
                     <field name="credit"/>
@@ -71,50 +72,11 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
                     <field name="type"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
 
-        <record id="view_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Account" version="7.0">
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="name" colspan="4"/>
-                            <field name="parent_id" on_change="on_change_parent(parent_id)"/>
-                            <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
-                        </group>
-                        <group>
-                            <field name="type"/>
-                            <field name="code"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Account Data">
-                            <group>
-                                <group string="Contacts">
-                                    <field name="partner_id"/>
-                                    <field name="user_id"/>
-                                </group>
-                                <group name="contract" string="Contract Data">
-                                    <field name="date_start"/>
-                                    <field name="date"/>
-                                    <field name="quantity_max"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Description">
-                            <field name="description"/>
-                        </page>
-                    </notebook>
-                </sheet>
-                </form>
-            </field>
-        </record>
 
         <record id="action_account_analytic_account_form" model="ir.actions.act_window">
             <field name="name">Analytic Accounts</field>
@@ -210,6 +172,7 @@
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
                     <field name="user_id" invisible="1" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py
index c7423675c15..6ca17a7ac0a 100644
--- a/addons/account/project/report/cost_ledger.py
+++ b/addons/account/project/report/cost_ledger.py
@@ -75,10 +75,10 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
         return res
 
     def _account_sum_debit(self, account, date1, date2):
-        return self._sum_debit(self, [account], date1, date2)
+        return self._sum_debit([account], date1, date2)
 
     def _account_sum_credit(self, account, date1, date2):
-        return self._sum_credit(self, [account], date1, date2)
+        return self._sum_credit([account], date1, date2)
 
     def _account_sum_balance(self, account, date1, date2):
         debit = self._account_sum_debit(account, date1, date2)
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 0ba4e4b6a3c..6897e15078d 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -497,7 +497,7 @@
               <para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
+              <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
@@ -590,7 +590,7 @@
               <para style="terp_default_8">[[ strip_name(line['partner_name'],20) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
+              <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 79003c5aaa6..7ae5db98f20 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -505,7 +505,7 @@
             <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency = company.currency_id) ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj= company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para>
@@ -529,7 +529,7 @@
               <para style="terp_default_7">[[ strip_name(line['partner_name'],20) ]]</para>
             </td>
             <td>
-              <para style="terp_default_7">[[ strip_name(line['lref'],17) ]]</para>
+              <para style="terp_default_7">[[ line['lref'] and strip_name(line['lref'],17) ]]</para>
             </td>
             <td>
               <para style="terp_default_7">[[ line['move'] ]]</para>
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 8fcb41d5ca6..0d7122369c6 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -519,7 +519,7 @@
               <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+              <para style="terp_default_8">[[ line['ref'] and strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index c61b8147a69..b878ab44e47 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -524,7 +524,7 @@
               <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+              <para style="terp_default_8">[[ line['ref'] and strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 7c5007a24fb..0d18a35b8a1 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -162,7 +162,7 @@
         </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.partner_id,'invoice') ]]</para>
+          <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 68c758eb495..2af649ba19f 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 class account_fiscalyear_close_state(osv.osv_memory):
     """
@@ -53,10 +54,6 @@ class account_fiscalyear_close_state(osv.osv_memory):
             cr.execute('UPDATE account_fiscalyear ' \
                     'SET state = %s WHERE id = %s', ('done', fy_id))
 
-            # Log message for Fiscalyear
-            fy_pool = self.pool.get('account.fiscalyear')
-            fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
-            fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
             return {'type': 'ir.actions.act_window_close'}
 
 account_fiscalyear_close_state()
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index fecf43f07ab..b2c61d9197a 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -53,11 +53,8 @@ class account_period_close(osv.osv_memory):
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
 
-                    # Log message for Period
-                    for period_id, name in period_pool.name_get(cr, uid, [id]):
-                        period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
         return {'type': 'ir.actions.act_window_close'}
 
 account_period_close()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: